Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1283656

[PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation

Show all headers | View raw

atl1c driver is doing order-4 allocation with GFP_ATOMIC
priority. That often breaks  networking after resume. Switch to
GFP_KERNEL. Still not ideal, but should be significantly better.

atl1c_setup_ring_resources() is called from .open() function, and
already uses GFP_KERNEL, so this change is safe.
    
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: stable <stable@vger.kernel.org>

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 2795d6d..8b5988e 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1016,13 +1016,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
 		sizeof(struct atl1c_recv_ret_status) * rx_desc_count +
 		8 * 4;
 
-	ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,
-				&ring_header->dma);
+	ring_header->desc = dma_zalloc_coherent(&pdev->dev, ring_header->size,
+						&ring_header->dma, GFP_KERNEL);
 	if (unlikely(!ring_header->desc)) {
-		dev_err(&pdev->dev, "pci_alloc_consistend failed\n");
+		dev_err(&pdev->dev, "could not get memory for DMA buffer\n");
 		goto err_nomem;
 	}
-	memset(ring_header->desc, 0, ring_header->size);
 	/* init TPD ring */
 
 	tpd_ring[0].dma = roundup(ring_header->dma, 8);

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation Pavel Machek <pavel@ucw.cz> - 2015-12-03 17:00 +0100
  Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation Michal Hocko <mhocko@kernel.org> - 2015-12-03 17:20 +0100
  Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation Eric Dumazet <eric.dumazet@gmail.com> - 2015-12-03 18:20 +0100
    Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation David Miller <davem@davemloft.net> - 2015-12-03 18:40 +0100
      Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation Pavel Machek <pavel@ucw.cz> - 2015-12-04 09:20 +0100
        Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation David Miller <davem@davemloft.net> - 2015-12-04 17:30 +0100
          Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation Pavel Machek <pavel@ucw.cz> - 2015-12-04 22:40 +0100
            Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation David Miller <davem@davemloft.net> - 2015-12-04 23:10 +0100
  [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC  allocation Pavel Machek <pavel@ucw.cz> - 2015-12-04 10:00 +0100

csiph-web