This is a note to let you know that I've just added the patch titled
atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ebe7fdbaf3e90ea22feade6c9f5e50f42b23b6d8 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Fri, 26 Jul 2013 12:47:14 -0400
Subject: atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring
From: Neil Horman <nhorman@xxxxxxxxxxxxx>
commit ebe7fdbaf3e90ea22feade6c9f5e50f42b23b6d8 upstream.
atl1c uses netdev_alloc_skb to refill its rx dma ring, but that call makes no
guarantees about the suitability of the memory for use in DMA. As a result
we've gotten reports of atl1c drivers occasionally hanging and needing to be
reset:
https://bugzilla.kernel.org/show_bug.cgi?id=54021
Fix this by modifying the call to use the internal version __netdev_alloc_skb,
where you can set the gfp_mask explicitly to include GFP_DMA.
Tested by two reporters in the above bug, who have the hardware to validate it.
Both report immediate cessation of the problem with this patch
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
CC: Jay Cliburn <jcliburn@xxxxxxxxx>
CC: "David S. Miller" <davem@xxxxxxxxxxxxx>
Tested-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
Tested-by: Vincent Alquier <vincent.alquier@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1660,7 +1660,7 @@ static int atl1c_alloc_rx_buffer(struct
while (next_info->flags & ATL1C_BUFFER_FREE) {
rfd_desc = ATL1C_RFD_DESC(rfd_ring, rfd_next_to_use);
- skb = netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len);
+ skb = __netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len, GFP_ATOMIC|GFP_DMA);
if (unlikely(!skb)) {
if (netif_msg_rx_err(adapter))
dev_warn(&pdev->dev, "alloc rx buffer failed\n");
Patches currently in stable-queue which might be from nhorman@xxxxxxxxxxxxx are
queue-3.10/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html