Skip to content

Commit aeb20b6

Browse files
isubramadavem330
authored andcommitted
drivers: net: xgene: fix: ifconfig up/down crash
Fixing kernel crash when doing ifconfig down and up in a loop, [ 124.028237] Call trace: [ 124.030670] [<ffffffc000367ce0>] memcpy+0x20/0x180 [ 124.035436] [<ffffffc00053c250>] skb_clone+0x3c/0xa8 [ 124.040374] [<ffffffc00053ffa4>] __skb_tstamp_tx+0xc0/0x118 [ 124.045918] [<ffffffc00054000c>] skb_tstamp_tx+0x10/0x1c [ 124.051203] [<ffffffc00049bc84>] xgene_enet_start_xmit+0x2e4/0x33c [ 124.057352] [<ffffffc00054fc20>] dev_hard_start_xmit+0x2e8/0x400 [ 124.063327] [<ffffffc00056cb14>] sch_direct_xmit+0x90/0x1d4 [ 124.068870] [<ffffffc000550100>] __dev_queue_xmit+0x28c/0x498 [ 124.074585] [<ffffffc00055031c>] dev_queue_xmit_sk+0x10/0x1c [ 124.080216] [<ffffffc0005c3f14>] ip_finish_output2+0x3d0/0x438 [ 124.086017] [<ffffffc0005c5794>] ip_finish_output+0x198/0x1ac [ 124.091732] [<ffffffc0005c61d4>] ip_output+0xec/0x164 [ 124.096755] [<ffffffc0005c5910>] ip_local_out_sk+0x38/0x48 [ 124.102211] [<ffffffc0005c5d84>] ip_queue_xmit+0x288/0x330 [ 124.107668] [<ffffffc0005da8bc>] tcp_transmit_skb+0x908/0x964 [ 124.113383] [<ffffffc0005dc0d4>] tcp_send_ack+0x128/0x138 [ 124.118753] [<ffffffc0005d1580>] __tcp_ack_snd_check+0x5c/0x94 [ 124.124555] [<ffffffc0005d7a0c>] tcp_rcv_established+0x554/0x68c [ 124.130530] [<ffffffc0005df0d4>] tcp_v4_do_rcv+0xa4/0x37c [ 124.135900] [<ffffffc000539430>] release_sock+0xb4/0x150 [ 124.141184] [<ffffffc0005cdf88>] tcp_recvmsg+0x448/0x9e0 [ 124.146468] [<ffffffc0005f2f3c>] inet_recvmsg+0xa0/0xc0 [ 124.151666] [<ffffffc000533660>] sock_recvmsg+0x10/0x1c [ 124.156863] [<ffffffc0005370d4>] SyS_recvfrom+0xa4/0xf8 [ 124.162061] Code: f2400c84 540001c0 cb040042 36000064 (38401423) [ 124.168133] ---[ end trace 7ab2550372e8a65b ]--- The fix was to reorder napi_enable, napi_disable, request_irq and free_irq calls, move register_netdev after dma_coerce_mask_and_coherent. Signed-off-by: Iyappan Subramanian <[email protected]> Tested-by: Khuong Dinh <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6527f83 commit aeb20b6

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,10 @@ static int xgene_enet_open(struct net_device *ndev)
688688
mac_ops->tx_enable(pdata);
689689
mac_ops->rx_enable(pdata);
690690

691+
xgene_enet_napi_enable(pdata);
691692
ret = xgene_enet_register_irq(ndev);
692693
if (ret)
693694
return ret;
694-
xgene_enet_napi_enable(pdata);
695695

696696
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
697697
phy_start(pdata->phy_dev);
@@ -715,13 +715,13 @@ static int xgene_enet_close(struct net_device *ndev)
715715
else
716716
cancel_delayed_work_sync(&pdata->link_work);
717717

718-
xgene_enet_napi_disable(pdata);
719-
xgene_enet_free_irq(ndev);
720-
xgene_enet_process_ring(pdata->rx_ring, -1);
721-
722718
mac_ops->tx_disable(pdata);
723719
mac_ops->rx_disable(pdata);
724720

721+
xgene_enet_free_irq(ndev);
722+
xgene_enet_napi_disable(pdata);
723+
xgene_enet_process_ring(pdata->rx_ring, -1);
724+
725725
return 0;
726726
}
727727

@@ -1474,30 +1474,33 @@ static int xgene_enet_probe(struct platform_device *pdev)
14741474
}
14751475
ndev->hw_features = ndev->features;
14761476

1477-
ret = register_netdev(ndev);
1477+
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64));
14781478
if (ret) {
1479-
netdev_err(ndev, "Failed to register netdev\n");
1479+
netdev_err(ndev, "No usable DMA configuration\n");
14801480
goto err;
14811481
}
14821482

1483-
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64));
1483+
ret = register_netdev(ndev);
14841484
if (ret) {
1485-
netdev_err(ndev, "No usable DMA configuration\n");
1485+
netdev_err(ndev, "Failed to register netdev\n");
14861486
goto err;
14871487
}
14881488

14891489
ret = xgene_enet_init_hw(pdata);
14901490
if (ret)
14911491
goto err;
14921492

1493-
xgene_enet_napi_add(pdata);
14941493
mac_ops = pdata->mac_ops;
1495-
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
1494+
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
14961495
ret = xgene_enet_mdio_config(pdata);
1497-
else
1496+
if (ret)
1497+
goto err;
1498+
} else {
14981499
INIT_DELAYED_WORK(&pdata->link_work, mac_ops->link_state);
1500+
}
14991501

1500-
return ret;
1502+
xgene_enet_napi_add(pdata);
1503+
return 0;
15011504
err:
15021505
unregister_netdev(ndev);
15031506
free_netdev(ndev);

0 commit comments

Comments
 (0)