lan743x: Fix RX Kernel Panic
Subsystems (3)
Bryan Whitehead
maintainerPATCH v2 1/1 lan743x: Fix RX Kernel Panic
It has been noticed that running the speed test at www.speedtest.net occasionally causes a kernel panic.
Investigation revealed that under this test RX buffer allocation sometimes fails and returns NULL. But the lan743x driver did not handle this case.
This patch fixes this issue by attempting to allocate a buffer before sending the new rx packet to the OS. If the allocation fails then the new rx packet is dropped and the existing buffer is reused in the DMA ring.
Updates for v2:
Additional 2 locations where allocation was not checked,
has been changed to reuse existing buffer.
--- drivers/net/ethernet/microchip/lan743x_main.c | 46 +++++++++++++++++++-------- 1 file changed, 32 insertions(+), 14 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.c +32 -14
@@ -1902,7 +1902,17 @@ static int lan743x_rx_next_index(struct lan743x_rx *rx, int index)return ((++index) % rx->ring_size); } -static int lan743x_rx_allocate_ring_element (struct lan743x_rx *rx,int index) +static struct sk_buff *lan743x_rx_allocate_skb (struct lan743x_rx *rx) +{ +int length =0 ; + + length = (LAN743X_MAX_FRAME_SIZE +ETH_HLEN +4 +RX_HEAD_PADDING ); +return __netdev_alloc_skb (rx->adapter->netdev, + length,GFP_ATOMIC |GFP_DMA ); +} + +static int lan743x_rx_init_ring_element (struct lan743x_rx *rx,int index, +struct sk_buff *skb) {struct lan743x_rx_buffer_info *buffer_info;struct lan743x_rx_descriptor *descriptor;
@@ -1911,9 +1921,7 @@ static int lan743x_rx_allocate_ring_element(struct lan743x_rx *rx, int index) length = (LAN743X_MAX_FRAME_SIZE +ETH_HLEN +4 +RX_HEAD_PADDING ); descriptor = &rx->ring_cpu_ptr[index]; buffer_info = &rx->buffer_info[index]; - buffer_info->skb =__netdev_alloc_skb (rx->adapter->netdev, - length, -GFP_ATOMIC |GFP_DMA ); + buffer_info->skb = skb;if (!(buffer_info->skb))return -ENOMEM ; buffer_info->dma_ptr = dma_map_single(&rx->adapter->pdev->dev,
@@ -2060,8 +2068,19 @@ static int lan743x_rx_process_packet(struct lan743x_rx *rx)/* packet is available */ if (first_index == last_index) {/* single buffer packet */ +struct sk_buff *new_skb =NULL ;int packet_length; + new_skb =lan743x_rx_allocate_skb (rx); +if (!new_skb) { +/* failed to allocate next skb. +* Memory is very low. +* Drop this packet and reuse buffer. +*/ +lan743x_rx_reuse_ring_element (rx, first_index); + goto process_extension; + } + buffer_info = &rx->buffer_info[first_index]; skb = buffer_info->skb; descriptor = &rx->ring_cpu_ptr[first_index];
@@ -2081,7 +2100,7 @@ static int lan743x_rx_process_packet(struct lan743x_rx *rx)skb_put (skb, packet_length -4 ); skb->protocol =eth_type_trans (skb, rx->adapter->netdev); -lan743x_rx_allocate_ring_element (rx, first_index); +lan743x_rx_init_ring_element (rx, first_index, new_skb); }else {int index = first_index;
@@ -2094,26 +2113,23 @@ static int lan743x_rx_process_packet(struct lan743x_rx *rx)if (first_index <= last_index) {while ((index >= first_index) && (index <= last_index)) { -lan743x_rx_release_ring_element (rx, - index); -lan743x_rx_allocate_ring_element (rx, - index); +lan743x_rx_reuse_ring_element (rx, + index); index =lan743x_rx_next_index (rx, index); } }else {while ((index >= first_index) || (index <= last_index)) { -lan743x_rx_release_ring_element (rx, - index); -lan743x_rx_allocate_ring_element (rx, - index); +lan743x_rx_reuse_ring_element (rx, + index); index =lan743x_rx_next_index (rx, index); } } } +process_extension:if (extension_index >=0 ) { descriptor = &rx->ring_cpu_ptr[extension_index]; buffer_info = &rx->buffer_info[extension_index];
@@ -2290,7 +2306,9 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx) rx->last_head =0 ;for (index =0 ; index < rx->ring_size; index++) { - ret =lan743x_rx_allocate_ring_element (rx, index); +struct sk_buff *new_skb =lan743x_rx_allocate_skb (rx); + + ret =lan743x_rx_init_ring_element (rx, index, new_skb);if (ret) goto cleanup; }
Signature · 1 line
2.7.4
David Miller
maintainerFrom: Bryan Whitehead <[email protected]>
Date: Mon, 11 Mar 2019 13:39:39 -0400
drivers/net/ethernet/microchip/lan743x_main.c static int lan743x_rx_ring_init(struct lan743x_rx *rx) · line 2311
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_main.c +3
-1@@ -2290,7 +2306,9 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx) rx->last_head =0 ;for (index =0 ; index < rx->ring_size; index++) { - ret =lan743x_rx_allocate_ring_element (rx, index); +struct sk_buff *new_skb =lan743x_rx_allocate_skb (rx); + + ret =lan743x_rx_init_ring_element (rx, index, new_skb);
Need to check new_skb for NULL.
Again....
[email protected]
maintainerQuoted 23 lines
-----Original Message-----
From: David Miller <[email protected]>
Sent: Monday, March 11, 2019 2:37 PM
To: Bryan Whitehead - C21958 <[email protected]>
Cc: [email protected]; UNGLinuxDriver <[email protected]>
Subject: Re: [PATCH v2 net] lan743x: Fix RX Kernel PanicFrom: Bryan Whitehead <[email protected]>
Date: Mon, 11 Mar 2019 13:39:39 -0400Review static int lan743x_rx_ring_init(struct lan743x_rx
Quoted 1 line
(quoted diff) +0
-0@@ -2290,7 +2306,9 @@ static int lan743x_rx_ring_init(struct lan743x_rx*rx)
drivers/net/ethernet/microchip/lan743x_main.c static int lan743x_rx_ring_init(struct lan743x_rx *rx) · line 2311
Quoted 7 lines
drivers/net/ethernet/microchip/lan743x_main.c +3
-1rx->last_head =0 ;for (index =0 ; index < rx->ring_size; index++) { - ret =lan743x_rx_allocate_ring_element (rx, index); +struct sk_buff *new_skb =lan743x_rx_allocate_skb (rx); + + ret =lan743x_rx_init_ring_element (rx, index, new_skb);Need to check
new_skbfor NULL.
Quoted 1 line
Again....
David,
In this case the function lan743x_rx_init_ring_element does not assume that new_skb is not NULL. It does check for NULL and returns error in that case.
It does this because allocation use to be inside lan743x_rx_init_ring_element, when its name was lan743x_rx_allocate_ring_element.
I pulled the allocation part out to solve the other problem, but functionally it Is exactly the same and will clean up appropriately if allocation returns NULL.
Regards,
Bryan
David Miller
maintainerFrom: <[email protected]>
Date: Mon, 11 Mar 2019 18:50:27 +0000
Quoted 2 lines
In this case the function
lan743x_rx_init_ring_elementdoes not assume thatnew_skbis not NULL. It does check for NULL and returns error in that case.
Aha, I see, thanks for pointing that out and correcting me. Let me review this some more.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Mon, 11 Mar 2019 12:18:12 -0700 (PDT)
Quoted 8 lines
From: <[email protected]>
Date: Mon, 11 Mar 2019 18:50:27 +0000Quoted 2 lines
In this case the function
lan743x_rx_init_ring_elementdoes not assume thatnew_skbis not NULL. It does check for NULL and returns error in that case.Aha, I see, thanks for pointing that out and correcting me. Let me review this some more.
Applied and queued up for -stable, thanks.
[email protected]
maintainerQuoted 1 line
Applied and queued up for -stable, thanks.
Thanks David