net: ll_temac: Bugfixes
cover net: ll_temac: Bugfixes
Fix a number of bugs which have been present since the first commit.
The bugs fixed in patch 1,2 and 4 have all been observed in real systems, and was relatively easy to reproduce given an appropriate stress setup.
Esben Haabendal (4):
net: ll_temac: Fix race condition causing TX hang
net: ll_temac: Add more error handling of dma_map_single() calls
net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC
pressure
net: ll_temac: Handle DMA halt condition caused by buffer underrun
drivers/net/ethernet/xilinx/ll_temac.h | 4 + drivers/net/ethernet/xilinx/ll_temac_main.c | 204 ++++++++++++++++---- 2 files changed, 170 insertions(+), 38 deletions(-)
Signature · 1 line
2.25.0
PATCH 1/4 net: ll_temac: Fix race condition causing TX hang
It is possible that the interrupt handler fires and frees up space in the TX ring in between checking for sufficient TX ring space and stopping the TX queue in temac_start_xmit. If this happens, the queue wake from the interrupt handler will occur before the queue is stopped, causing a lost wakeup and the adapter's transmit hanging.
To avoid this, after stopping the queue, check again whether there is sufficient space in the TX ring. If so, wake up the queue again.
This is a port of the similar fix in axienet driver,
commit 7de44285c1f6 ("net: axienet: Fix race condition causing TX hang").
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/net/ethernet/xilinx/ll_temac_main.c +16 -3
@@ -788,6 +788,9 @@ static void temac_start_xmit_done(struct net_device *ndev) stat =be32_to_cpu (cur_p->app0); } +/* Matches barrier in temac_start_xmit */ +smp_mb (); +netif_wake_queue (ndev); }
@@ -830,9 +833,19 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail];if (temac_check_tx_bd_space (lp, num_frag +1 )) { -if (!netif_queue_stopped (ndev)) -netif_stop_queue (ndev); -return NETDEV_TX_BUSY ; +if (netif_queue_stopped (ndev)) +return NETDEV_TX_BUSY ; + +netif_stop_queue (ndev); + +/* Matches barrier in temac_start_xmit_done */ +smp_mb (); + +/* Space might have just been freed - check again */ +if (temac_check_tx_bd_space (lp, num_frag)) +return NETDEV_TX_BUSY ; + +netif_wake_queue (ndev); } cur_p->app0 =0 ;
Signature · 1 line
2.25.0
PATCH 2/4 net: ll_temac: Add more error handling of dma_map_single() calls
In reply to Esben HaabendalThis adds error handling to the remaining dma_map_single() calls, so that behavior is well defined if/when we run out of DMA memory.
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 26 +++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/ethernet/xilinx/ll_temac_main.c +24 -2
@@ -367,6 +367,8 @@ static int temac_dma_bd_init(struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,XTE_MAX_JUMBO_FRAME_SIZE ,DMA_FROM_DEVICE ); +if (dma_mapping_error (ndev->dev.parent, skb_dma_addr)) + goto out; lp->rx_bd_v[i].phys =cpu_to_be32 (skb_dma_addr); lp->rx_bd_v[i].len =cpu_to_be32 (XTE_MAX_JUMBO_FRAME_SIZE ); lp->rx_bd_v[i].app0 =cpu_to_be32 (STS_CTRL_APP0_IRQONEND );
@@ -863,12 +865,13 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,skb_headlen (skb),DMA_TO_DEVICE ); cur_p->len =cpu_to_be32 (skb_headlen (skb)); +if (WARN_ON_ONCE (dma_mapping_error (ndev->dev.parent, skb_dma_addr))) +return NETDEV_TX_BUSY ; cur_p->phys =cpu_to_be32 (skb_dma_addr);ptr_to_txbd ((void *)skb, cur_p);for (ii =0 ; ii < num_frag; ii++) { - lp->tx_bd_tail++; -if (lp->tx_bd_tail >=TX_BD_NUM ) +if (++lp->tx_bd_tail >=TX_BD_NUM ) lp->tx_bd_tail =0 ; cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
@@ -876,6 +879,25 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)skb_frag_address (frag),skb_frag_size (frag), DMA_TO_DEVICE); +if (dma_mapping_error (ndev->dev.parent, skb_dma_addr)) { +if (--lp->tx_bd_tail <0 ) + lp->tx_bd_tail =TX_BD_NUM -1 ; + cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; +while (--ii >=0 ) { + --frag; +dma_unmap_single (ndev->dev.parent, +be32_to_cpu (cur_p->phys), +skb_frag_size (frag), +DMA_TO_DEVICE ); +if (--lp->tx_bd_tail <0 ) + lp->tx_bd_tail =TX_BD_NUM -1 ; + cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; + } +dma_unmap_single (ndev->dev.parent, +be32_to_cpu (cur_p->phys), +skb_headlen (skb),DMA_TO_DEVICE ); +return NETDEV_TX_BUSY ; + } cur_p->phys =cpu_to_be32 (skb_dma_addr); cur_p->len =cpu_to_be32 (skb_frag_size (frag)); cur_p->app0 =0 ;
Signature · 1 line
2.25.0
PATCH 3/4 net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC pressure
In reply to Esben HaabendalFailures caused by GFP_ATOMIC memory pressure have been observed, and due to the missing error handling, results in kernel crash such as
[1876998.350133] kernel BUG at mm/slub.c:3952! [1876998.350141] invalid opcode: 0000 [#1] PREEMPT SMP PTI [1876998.350147] CPU: 2 PID: 0 Comm: swapper/2 Not tainted 5.3.0-scnxt #1 [1876998.350150] Hardware name: N/A N/A/COMe-bIP2, BIOS CCR2R920 03/01/2017 [1876998.350160] RIP: 0010:kfree+0x1ca/0x220 [1876998.350164] Code: 85 db 74 49 48 8b 95 68 01 00 00 48 31 c2 48 89 10 e9 d7 fe ff ff 49 8b 04 24 a9 00 00 01 00 75 0b 49 8b 44 24 08 a8 01 75 02 <0f> 0b 49 8b 04 24 31 f6 a9 00 00 01 00 74 06 41 0f b6 74 24 5b [1876998.350172] RSP: 0018:ffffc900000f0df0 EFLAGS: 00010246 [1876998.350177] RAX: ffffea00027f0708 RBX: ffff888008d78000 RCX: 0000000000391372 [1876998.350181] RDX: 0000000000000000 RSI: ffffe8ffffd01400 RDI: ffff888008d78000 [1876998.350185] RBP: ffff8881185a5d00 R08: ffffc90000087dd8 R09: 000000000000280a [1876998.350189] R10: 0000000000000002 R11: 0000000000000000 R12: ffffea0000235e00 [1876998.350193] R13: ffff8881185438a0 R14: 0000000000000000 R15: ffff888118543870 [1876998.350198] FS: 0000000000000000(0000) GS:ffff88811f300000(0000) knlGS:0000000000000000 [1876998.350203] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 s#1 Part1 [1876998.350206] CR2: 00007f8dac7b09f0 CR3: 000000011e20a006 CR4: 00000000001606e0 [1876998.350210] Call Trace: [1876998.350215] <IRQ> [1876998.350224] ? __netif_receive_skb_core+0x70a/0x920 [1876998.350229] kfree_skb+0x32/0xb0 [1876998.350234] __netif_receive_skb_core+0x70a/0x920 [1876998.350240] __netif_receive_skb_one_core+0x36/0x80 [1876998.350245] process_backlog+0x8b/0x150 [1876998.350250] net_rx_action+0xf7/0x340 [1876998.350255] __do_softirq+0x10f/0x353 [1876998.350262] irq_exit+0xb2/0xc0 [1876998.350265] do_IRQ+0x77/0xd0 [1876998.350271] common_interrupt+0xf/0xf [1876998.350274] </IRQ>
In order to handle such failures more graceful, this change splits the receive loop into one for consuming the received buffers, and one for allocating new buffers.
When GFP_ATOMIC allocations fail, the receive will continue with the buffers that is still there, and with the expectation that the allocations will succeed in a later call to receive.
--- drivers/net/ethernet/xilinx/ll_temac.h | 1 + drivers/net/ethernet/xilinx/ll_temac_main.c | 112 ++++++++++++++------ 2 files changed, 82 insertions(+), 31 deletions(-)
drivers/net/ethernet/xilinx/ll_temac.h +1 -0
@@ -375,6 +375,7 @@ struct temac_local {int tx_bd_next;int tx_bd_tail;int rx_bd_ci; +int rx_bd_tail;/* DMA channel control setup */ u32 tx_chnl_ctrl;
drivers/net/ethernet/xilinx/ll_temac_main.c +81 -31
159 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH 4/4 net: ll_temac: Handle DMA halt condition caused by buffer underrun
In reply to Esben HaabendalThe SDMA engine used by TEMAC halts operation when it has finished processing of the last buffer descriptor in the buffer ring. Unfortunately, no interrupt event is generated when this happens, so we need to setup another mechanism to make sure DMA operation is restarted when enough buffers have been added to the ring.
--- drivers/net/ethernet/xilinx/ll_temac.h | 3 ++ drivers/net/ethernet/xilinx/ll_temac_main.c | 47 ++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-)
drivers/net/ethernet/xilinx/ll_temac.h +3 -0
@@ -380,6 +380,9 @@ struct temac_local {/* DMA channel control setup */ u32 tx_chnl_ctrl;u32 rx_chnl_ctrl; +u8 coalesce_count_rx; + +struct delayed_work restart_work; };/* Wrappers for temac_ior()/temac_iow() function pointers above */
drivers/net/ethernet/xilinx/ll_temac_main.c +45 -2
98 lines not on this page · raw message
Signature · 1 line
2.25.0
David Miller
maintainerRe: [PATCH net 2/4] net: ll_temac: Add more error handling of dma_map_single() calls
In reply to Esben HaabendalFrom: Esben Haabendal <[email protected]>
Date: Wed, 19 Feb 2020 11:54:00 +0100
drivers/net/ethernet/xilinx/ll_temac_main.c temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) · line 869
Quoted 6 lines
drivers/net/ethernet/xilinx/ll_temac_main.c +2
-0@@ -863,12 +865,13 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,skb_headlen (skb),DMA_TO_DEVICE ); cur_p->len =cpu_to_be32 (skb_headlen (skb)); +if (WARN_ON_ONCE (dma_mapping_error (ndev->dev.parent, skb_dma_addr))) +return NETDEV_TX_BUSY ;
The appropriate behavior in this situation is to drop the packet and return NETDEV_TX_OK.
Re: [PATCH net 2/4] net: ll_temac: Add more error handling of dma_map_single() calls
Quoted 12 lines · David Miller
From: Esben Haabendal <[email protected]>
Date: Wed, 19 Feb 2020 11:54:00 +0100drivers/net/ethernet/xilinx/ll_temac_main.c temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) · line 869
Quoted 6 lines
drivers/net/ethernet/xilinx/ll_temac_main.c +2
-0@@ -863,12 +865,13 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,skb_headlen (skb),DMA_TO_DEVICE ); cur_p->len =cpu_to_be32 (skb_headlen (skb)); +if (WARN_ON_ONCE (dma_mapping_error (ndev->dev.parent, skb_dma_addr))) +return NETDEV_TX_BUSY ;The appropriate behavior in this situation is to drop the packet and return
NETDEV_TX_OK.
Ok, and I guess the same goes for the error handling of dma_map_single() of one of the fragments later in same function.
/Esben
David Miller
maintainerRe: [PATCH net 2/4] net: ll_temac: Add more error handling of dma_map_single() calls
From: Esben Haabendal <[email protected]>
Date: Thu, 20 Feb 2020 09:32:58 +0100
Quoted 15 lines
Quoted 12 lines · David Miller
From: Esben Haabendal <[email protected]>
Date: Wed, 19 Feb 2020 11:54:00 +0100drivers/net/ethernet/xilinx/ll_temac_main.c temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) · line 869
Quoted 6 lines
drivers/net/ethernet/xilinx/ll_temac_main.c +2
-0@@ -863,12 +865,13 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,skb_headlen (skb),DMA_TO_DEVICE ); cur_p->len =cpu_to_be32 (skb_headlen (skb)); +if (WARN_ON_ONCE (dma_mapping_error (ndev->dev.parent, skb_dma_addr))) +return NETDEV_TX_BUSY ;The appropriate behavior in this situation is to drop the packet and return
NETDEV_TX_OK.
Quoted 2 lines
Ok, and I guess the same goes for the error handling of
dma_map_single()of one of the fragments later in same function.
Yes.
v2 cover net: ll_temac: Bugfixes
In reply to Esben HaabendalFix a number of bugs which have been present since the first commit.
The bugs fixed in patch 1,2 and 4 have all been observed in real systems, and was relatively easy to reproduce given an appropriate stress setup.
Changes since v1:
- Changed error handling of of dma_map_single() in temac_start_xmit() to drop packet instead of returning NETDEV_TX_BUSY.
Esben Haabendal (4):
net: ll_temac: Fix race condition causing TX hang
net: ll_temac: Add more error handling of dma_map_single() calls
net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC
pressure
net: ll_temac: Handle DMA halt condition caused by buffer underrun
drivers/net/ethernet/xilinx/ll_temac.h | 4 + drivers/net/ethernet/xilinx/ll_temac_main.c | 209 ++++++++++++++++---- 2 files changed, 175 insertions(+), 38 deletions(-)
Signature · 1 line
2.25.0
PATCH v2 1/4 net: ll_temac: Fix race condition causing TX hang
It is possible that the interrupt handler fires and frees up space in the TX ring in between checking for sufficient TX ring space and stopping the TX queue in temac_start_xmit. If this happens, the queue wake from the interrupt handler will occur before the queue is stopped, causing a lost wakeup and the adapter's transmit hanging.
To avoid this, after stopping the queue, check again whether there is sufficient space in the TX ring. If so, wake up the queue again.
This is a port of the similar fix in axienet driver,
commit 7de44285c1f6 ("net: axienet: Fix race condition causing TX hang").
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/net/ethernet/xilinx/ll_temac_main.c +16 -3
@@ -788,6 +788,9 @@ static void temac_start_xmit_done(struct net_device *ndev) stat =be32_to_cpu (cur_p->app0); } +/* Matches barrier in temac_start_xmit */ +smp_mb (); +netif_wake_queue (ndev); }
@@ -830,9 +833,19 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail];if (temac_check_tx_bd_space (lp, num_frag +1 )) { -if (!netif_queue_stopped (ndev)) -netif_stop_queue (ndev); -return NETDEV_TX_BUSY ; +if (netif_queue_stopped (ndev)) +return NETDEV_TX_BUSY ; + +netif_stop_queue (ndev); + +/* Matches barrier in temac_start_xmit_done */ +smp_mb (); + +/* Space might have just been freed - check again */ +if (temac_check_tx_bd_space (lp, num_frag)) +return NETDEV_TX_BUSY ; + +netif_wake_queue (ndev); } cur_p->app0 =0 ;
Signature · 1 line
2.25.0
PATCH v2 2/4 net: ll_temac: Add more error handling of dma_map_single() calls
In reply to Esben HaabendalThis adds error handling to the remaining dma_map_single() calls, so that behavior is well defined if/when we run out of DMA memory.
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 26 +++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/ethernet/xilinx/ll_temac_main.c +24 -2
@@ -367,6 +367,8 @@ static int temac_dma_bd_init(struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,XTE_MAX_JUMBO_FRAME_SIZE ,DMA_FROM_DEVICE ); +if (dma_mapping_error (ndev->dev.parent, skb_dma_addr)) + goto out; lp->rx_bd_v[i].phys =cpu_to_be32 (skb_dma_addr); lp->rx_bd_v[i].len =cpu_to_be32 (XTE_MAX_JUMBO_FRAME_SIZE ); lp->rx_bd_v[i].app0 =cpu_to_be32 (STS_CTRL_APP0_IRQONEND );
@@ -863,12 +865,13 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_dma_addr =dma_map_single (ndev->dev.parent, skb->data,skb_headlen (skb),DMA_TO_DEVICE ); cur_p->len =cpu_to_be32 (skb_headlen (skb)); +if (WARN_ON_ONCE (dma_mapping_error (ndev->dev.parent, skb_dma_addr))) +return NETDEV_TX_BUSY ; cur_p->phys =cpu_to_be32 (skb_dma_addr);ptr_to_txbd ((void *)skb, cur_p);for (ii =0 ; ii < num_frag; ii++) { - lp->tx_bd_tail++; -if (lp->tx_bd_tail >=TX_BD_NUM ) +if (++lp->tx_bd_tail >=TX_BD_NUM ) lp->tx_bd_tail =0 ; cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
@@ -876,6 +879,25 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)skb_frag_address (frag),skb_frag_size (frag), DMA_TO_DEVICE); +if (dma_mapping_error (ndev->dev.parent, skb_dma_addr)) { +if (--lp->tx_bd_tail <0 ) + lp->tx_bd_tail =TX_BD_NUM -1 ; + cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; +while (--ii >=0 ) { + --frag; +dma_unmap_single (ndev->dev.parent, +be32_to_cpu (cur_p->phys), +skb_frag_size (frag), +DMA_TO_DEVICE ); +if (--lp->tx_bd_tail <0 ) + lp->tx_bd_tail =TX_BD_NUM -1 ; + cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; + } +dma_unmap_single (ndev->dev.parent, +be32_to_cpu (cur_p->phys), +skb_headlen (skb),DMA_TO_DEVICE ); +return NETDEV_TX_BUSY ; + } cur_p->phys =cpu_to_be32 (skb_dma_addr); cur_p->len =cpu_to_be32 (skb_frag_size (frag)); cur_p->app0 =0 ;
Signature · 1 line
2.25.0
PATCH v2 3/4 net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC pressure
In reply to Esben HaabendalFailures caused by GFP_ATOMIC memory pressure have been observed, and due to the missing error handling, results in kernel crash such as
[1876998.350133] kernel BUG at mm/slub.c:3952! [1876998.350141] invalid opcode: 0000 [#1] PREEMPT SMP PTI [1876998.350147] CPU: 2 PID: 0 Comm: swapper/2 Not tainted 5.3.0-scnxt #1 [1876998.350150] Hardware name: N/A N/A/COMe-bIP2, BIOS CCR2R920 03/01/2017 [1876998.350160] RIP: 0010:kfree+0x1ca/0x220 [1876998.350164] Code: 85 db 74 49 48 8b 95 68 01 00 00 48 31 c2 48 89 10 e9 d7 fe ff ff 49 8b 04 24 a9 00 00 01 00 75 0b 49 8b 44 24 08 a8 01 75 02 <0f> 0b 49 8b 04 24 31 f6 a9 00 00 01 00 74 06 41 0f b6 74 24 5b [1876998.350172] RSP: 0018:ffffc900000f0df0 EFLAGS: 00010246 [1876998.350177] RAX: ffffea00027f0708 RBX: ffff888008d78000 RCX: 0000000000391372 [1876998.350181] RDX: 0000000000000000 RSI: ffffe8ffffd01400 RDI: ffff888008d78000 [1876998.350185] RBP: ffff8881185a5d00 R08: ffffc90000087dd8 R09: 000000000000280a [1876998.350189] R10: 0000000000000002 R11: 0000000000000000 R12: ffffea0000235e00 [1876998.350193] R13: ffff8881185438a0 R14: 0000000000000000 R15: ffff888118543870 [1876998.350198] FS: 0000000000000000(0000) GS:ffff88811f300000(0000) knlGS:0000000000000000 [1876998.350203] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 s#1 Part1 [1876998.350206] CR2: 00007f8dac7b09f0 CR3: 000000011e20a006 CR4: 00000000001606e0 [1876998.350210] Call Trace: [1876998.350215] <IRQ> [1876998.350224] ? __netif_receive_skb_core+0x70a/0x920 [1876998.350229] kfree_skb+0x32/0xb0 [1876998.350234] __netif_receive_skb_core+0x70a/0x920 [1876998.350240] __netif_receive_skb_one_core+0x36/0x80 [1876998.350245] process_backlog+0x8b/0x150 [1876998.350250] net_rx_action+0xf7/0x340 [1876998.350255] __do_softirq+0x10f/0x353 [1876998.350262] irq_exit+0xb2/0xc0 [1876998.350265] do_IRQ+0x77/0xd0 [1876998.350271] common_interrupt+0xf/0xf [1876998.350274] </IRQ>
In order to handle such failures more graceful, this change splits the receive loop into one for consuming the received buffers, and one for allocating new buffers.
When GFP_ATOMIC allocations fail, the receive will continue with the buffers that is still there, and with the expectation that the allocations will succeed in a later call to receive.
--- drivers/net/ethernet/xilinx/ll_temac.h | 1 + drivers/net/ethernet/xilinx/ll_temac_main.c | 112 ++++++++++++++------ 2 files changed, 82 insertions(+), 31 deletions(-)
drivers/net/ethernet/xilinx/ll_temac.h +1 -0
@@ -375,6 +375,7 @@ struct temac_local {int tx_bd_next;int tx_bd_tail;int rx_bd_ci; +int rx_bd_tail;/* DMA channel control setup */ u32 tx_chnl_ctrl;
drivers/net/ethernet/xilinx/ll_temac_main.c +81 -31
159 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH v2 4/4 net: ll_temac: Handle DMA halt condition caused by buffer underrun
In reply to Esben HaabendalThe SDMA engine used by TEMAC halts operation when it has finished processing of the last buffer descriptor in the buffer ring. Unfortunately, no interrupt event is generated when this happens, so we need to setup another mechanism to make sure DMA operation is restarted when enough buffers have been added to the ring.
--- drivers/net/ethernet/xilinx/ll_temac.h | 3 ++ drivers/net/ethernet/xilinx/ll_temac_main.c | 58 +++++++++++++++++++-- 2 files changed, 56 insertions(+), 5 deletions(-)
drivers/net/ethernet/xilinx/ll_temac.h +3 -0
@@ -380,6 +380,9 @@ struct temac_local {/* DMA channel control setup */ u32 tx_chnl_ctrl;u32 rx_chnl_ctrl; +u8 coalesce_count_rx; + +struct delayed_work restart_work; };/* Wrappers for temac_ior()/temac_iow() function pointers above */
drivers/net/ethernet/xilinx/ll_temac_main.c +53 -5
121 lines not on this page · raw message
Signature · 1 line
2.25.0
David Miller
maintainerFrom: Esben Haabendal <[email protected]>
Date: Fri, 21 Feb 2020 07:47:09 +0100
Quoted 9 lines
Fix a number of bugs which have been present since the first commit.
The bugs fixed in patch 1,2 and 4 have all been observed in real systems, and was relatively easy to reproduce given an appropriate stress setup.
Changes since v1:
- Changed error handling of of
dma_map_single()intemac_start_xmit()to drop packet instead of returningNETDEV_TX_BUSY.
Series applied, thanks.