* Re: [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation
2015-11-28 14:51 ` [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation Pavel Machek
@ 2015-11-29 21:58 ` Sergei Shtylyov
2015-11-30 13:21 ` Michal Hocko
` (2 subsequent siblings)
3 siblings, 0 replies; 22+ messages in thread
From: Sergei Shtylyov @ 2015-11-29 21:58 UTC (permalink / raw)
To: Pavel Machek, Michal Hocko, davem, Andrew Morton
Cc: kernel list, jcliburn, chris.snook, netdev, Rafael J. Wysocki,
linux-mm, nic-devel, ronangeles, ebiederm
Hello.
On 11/28/2015 5:51 PM, Pavel Machek wrote:
> 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.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 2795d6d..afb71e0 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -1016,10 +1016,10 @@ 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_alloc_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 memmory for DMA buffer\n");
s/memmory/memory/.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation
2015-11-28 14:51 ` [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation Pavel Machek
2015-11-29 21:58 ` Sergei Shtylyov
@ 2015-11-30 13:21 ` Michal Hocko
2015-12-01 20:35 ` David Miller
2015-11-30 17:58 ` Eric Dumazet
2015-12-03 15:59 ` [PATCH net] atl1c: Improve " Pavel Machek
3 siblings, 1 reply; 22+ messages in thread
From: Michal Hocko @ 2015-11-30 13:21 UTC (permalink / raw)
To: Pavel Machek
Cc: davem, Andrew Morton, kernel list, jcliburn, chris.snook, netdev,
Rafael J. Wysocki, linux-mm, nic-devel, ronangeles, ebiederm
On Sat 28-11-15 15:51:13, Pavel Machek wrote:
>
> 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.
It is not clear why GFP_KERNEL can replace GFP_ATOMIC safely neither
from the changelog nor from the patch context. It is correct here
because atl1c_setup_ring_resources is a sleepable context (otherwise
tpd_ring->buffer_info = kzalloc(size, GFP_KERNEL) would be incorrect
already) but a short note wouldn't kill us, would it?
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
Anyway
Reviewed-by: Michal Hocko <mhocko@suse.com>
>
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 2795d6d..afb71e0 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -1016,10 +1016,10 @@ 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_alloc_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 memmory for DMA buffer\n");
> goto err_nomem;
> }
> memset(ring_header->desc, 0, ring_header->size);
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation
2015-11-30 13:21 ` Michal Hocko
@ 2015-12-01 20:35 ` David Miller
[not found] ` <CAMXMK6u1vQ772SGv-J3cKvOmS6QRAjjQLYiSiWO2+T=HRTiK1A@mail.gmail.com>
0 siblings, 1 reply; 22+ messages in thread
From: David Miller @ 2015-12-01 20:35 UTC (permalink / raw)
To: mhocko
Cc: pavel, akpm, linux-kernel, jcliburn, chris.snook, netdev, rjw,
linux-mm, nic-devel, ronangeles, ebiederm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: Text/Plain; charset=utf-8, Size: 700 bytes --]
From: Michal Hocko <mhocko@kernel.org>
Date: Mon, 30 Nov 2015 14:21:29 +0100
> On Sat 28-11-15 15:51:13, Pavel Machek wrote:
>>
>> 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.
>
> It is not clear why GFP_KERNEL can replace GFP_ATOMIC safely neither
> from the changelog nor from the patch context.
Earlier in the function we do a GFP_KERNEL kmalloc so:
¯\_(ツ)_/¯
It should be fine.
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation
2015-11-28 14:51 ` [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation Pavel Machek
2015-11-29 21:58 ` Sergei Shtylyov
2015-11-30 13:21 ` Michal Hocko
@ 2015-11-30 17:58 ` Eric Dumazet
2015-12-01 20:36 ` David Miller
2015-12-03 15:59 ` [PATCH net] atl1c: Improve " Pavel Machek
3 siblings, 1 reply; 22+ messages in thread
From: Eric Dumazet @ 2015-11-30 17:58 UTC (permalink / raw)
To: Pavel Machek
Cc: Michal Hocko, davem, Andrew Morton, kernel list, jcliburn,
chris.snook, netdev, Rafael J. Wysocki, linux-mm, nic-devel,
ronangeles, ebiederm
On Sat, 2015-11-28 at 15:51 +0100, Pavel Machek wrote:
> 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.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 2795d6d..afb71e0 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -1016,10 +1016,10 @@ 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_alloc_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 memmory for DMA buffer\n");
> goto err_nomem;
> }
> memset(ring_header->desc, 0, ring_header->size);
>
It seems there is a missed opportunity to get rid of the memset() here,
by adding __GFP_ZERO to the dma_alloc_coherent() GFP_KERNEL mask,
or simply using dma_zalloc_coherent()
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation
2015-11-30 17:58 ` Eric Dumazet
@ 2015-12-01 20:36 ` David Miller
2015-12-03 15:59 ` Pavel Machek
0 siblings, 1 reply; 22+ messages in thread
From: David Miller @ 2015-12-01 20:36 UTC (permalink / raw)
To: eric.dumazet
Cc: pavel, mhocko, akpm, linux-kernel, jcliburn, chris.snook, netdev,
rjw, linux-mm, nic-devel, ronangeles, ebiederm
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 30 Nov 2015 09:58:23 -0800
> On Sat, 2015-11-28 at 15:51 +0100, Pavel Machek wrote:
>> 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.
>>
>> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>>
>> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
>> index 2795d6d..afb71e0 100644
>> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
>> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
>> @@ -1016,10 +1016,10 @@ 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_alloc_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 memmory for DMA buffer\n");
>> goto err_nomem;
>> }
>> memset(ring_header->desc, 0, ring_header->size);
>>
>
> It seems there is a missed opportunity to get rid of the memset() here,
> by adding __GFP_ZERO to the dma_alloc_coherent() GFP_KERNEL mask,
> or simply using dma_zalloc_coherent()
Also, the Subject line needs to be adjusted. The proper format for
the Subject line is:
[PATCH $TREE] $subsystem: $description.
Where "$TREE" is either 'net' or 'net-next', $subsystem is the lowercase
name of the driver (here 'atl1c') and then a colon, and then a space, and
then the single-line description.
Thanks.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation
2015-12-01 20:36 ` David Miller
@ 2015-12-03 15:59 ` Pavel Machek
0 siblings, 0 replies; 22+ messages in thread
From: Pavel Machek @ 2015-12-03 15:59 UTC (permalink / raw)
To: David Miller
Cc: eric.dumazet, mhocko, akpm, linux-kernel, jcliburn, chris.snook,
netdev, rjw, linux-mm, nic-devel, ronangeles, ebiederm
On Tue 2015-12-01 15:36:28, David Miller wrote:
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Mon, 30 Nov 2015 09:58:23 -0800
>
> > On Sat, 2015-11-28 at 15:51 +0100, Pavel Machek wrote:
> >> 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.
> >>
> >> Signed-off-by: Pavel Machek <pavel@ucw.cz>
> >>
> >> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> >> index 2795d6d..afb71e0 100644
> >> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> >> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> >> @@ -1016,10 +1016,10 @@ 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_alloc_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 memmory for DMA buffer\n");
> >> goto err_nomem;
> >> }
> >> memset(ring_header->desc, 0, ring_header->size);
> >>
> >
> > It seems there is a missed opportunity to get rid of the memset() here,
> > by adding __GFP_ZERO to the dma_alloc_coherent() GFP_KERNEL mask,
> > or simply using dma_zalloc_coherent()
>
> Also, the Subject line needs to be adjusted. The proper format for
> the Subject line is:
>
> [PATCH $TREE] $subsystem: $description.
>
> Where "$TREE" is either 'net' or 'net-next', $subsystem is the lowercase
> name of the driver (here 'atl1c') and then a colon, and then a space, and
> then the single-line description.
Done, thanks.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-11-28 14:51 ` [PATCH] Improve Atheros ethernet driver not to do order 4 GFP_ATOMIC allocation Pavel Machek
` (2 preceding siblings ...)
2015-11-30 17:58 ` Eric Dumazet
@ 2015-12-03 15:59 ` Pavel Machek
2015-12-03 16:13 ` Michal Hocko
` (2 more replies)
3 siblings, 3 replies; 22+ messages in thread
From: Pavel Machek @ 2015-12-03 15:59 UTC (permalink / raw)
To: Michal Hocko, davem, Andrew Morton
Cc: kernel list, jcliburn, chris.snook, netdev, Rafael J. Wysocki,
linux-mm, nic-devel, ronangeles, ebiederm
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>
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 2795d6d..afb71e0 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1016,10 +1016,10 @@ 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_alloc_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);
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-03 15:59 ` [PATCH net] atl1c: Improve " Pavel Machek
@ 2015-12-03 16:13 ` Michal Hocko
2015-12-03 17:17 ` Eric Dumazet
2015-12-04 8:50 ` Pavel Machek
2 siblings, 0 replies; 22+ messages in thread
From: Michal Hocko @ 2015-12-03 16:13 UTC (permalink / raw)
To: Pavel Machek
Cc: davem, Andrew Morton, kernel list, jcliburn, chris.snook, netdev,
Rafael J. Wysocki, linux-mm, nic-devel, ronangeles, ebiederm
On Thu 03-12-15 16:59:05, Pavel Machek wrote:
>
> 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.
Thanks for updating the changelog
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
>
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 2795d6d..afb71e0 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -1016,10 +1016,10 @@ 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_alloc_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);
>
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-03 15:59 ` [PATCH net] atl1c: Improve " Pavel Machek
2015-12-03 16:13 ` Michal Hocko
@ 2015-12-03 17:17 ` Eric Dumazet
2015-12-03 17:32 ` David Miller
2015-12-04 8:50 ` Pavel Machek
2 siblings, 1 reply; 22+ messages in thread
From: Eric Dumazet @ 2015-12-03 17:17 UTC (permalink / raw)
To: Pavel Machek
Cc: Michal Hocko, davem, Andrew Morton, kernel list, jcliburn,
chris.snook, netdev, Rafael J. Wysocki, linux-mm, nic-devel,
ronangeles, ebiederm
On Thu, 2015-12-03 at 16:59 +0100, Pavel Machek wrote:
> 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>
>
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 2795d6d..afb71e0 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -1016,10 +1016,10 @@ 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_alloc_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);
>
>
So this memset() will really require a different patch to get removed ?
Sigh, not sure why I review patches.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-03 17:17 ` Eric Dumazet
@ 2015-12-03 17:32 ` David Miller
2015-12-04 8:11 ` Pavel Machek
0 siblings, 1 reply; 22+ messages in thread
From: David Miller @ 2015-12-03 17:32 UTC (permalink / raw)
To: eric.dumazet
Cc: pavel, mhocko, akpm, linux-kernel, jcliburn, chris.snook, netdev,
rjw, linux-mm, nic-devel, ronangeles, ebiederm
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 03 Dec 2015 09:17:28 -0800
> On Thu, 2015-12-03 at 16:59 +0100, Pavel Machek wrote:
>> 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>
>>
>> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
>> index 2795d6d..afb71e0 100644
>> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
>> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
>> @@ -1016,10 +1016,10 @@ 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_alloc_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);
>>
>>
>
> So this memset() will really require a different patch to get removed ?
>
> Sigh, not sure why I review patches.
Agreed, please use dma_zalloc_coherent() and kill that memset().
Thanks.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-03 17:32 ` David Miller
@ 2015-12-04 8:11 ` Pavel Machek
2015-12-04 16:21 ` David Miller
0 siblings, 1 reply; 22+ messages in thread
From: Pavel Machek @ 2015-12-04 8:11 UTC (permalink / raw)
To: David Miller
Cc: eric.dumazet, mhocko, akpm, linux-kernel, jcliburn, chris.snook,
netdev, rjw, linux-mm, nic-devel, ronangeles, ebiederm
> >> 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);
> >>
> >>
> >
> > So this memset() will really require a different patch to get removed ?
> >
> > Sigh, not sure why I review patches.
>
> Agreed, please use dma_zalloc_coherent() and kill that memset().
Ok, updated. I'll also add cc: stable, because it makes notebooks with
affected chipset unusable.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-04 8:11 ` Pavel Machek
@ 2015-12-04 16:21 ` David Miller
2015-12-04 21:30 ` Pavel Machek
0 siblings, 1 reply; 22+ messages in thread
From: David Miller @ 2015-12-04 16:21 UTC (permalink / raw)
To: pavel
Cc: eric.dumazet, mhocko, akpm, linux-kernel, jcliburn, chris.snook,
netdev, rjw, linux-mm, nic-devel, ronangeles, ebiederm
From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 4 Dec 2015 09:11:27 +0100
>> >> 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);
>> >>
>> >>
>> >
>> > So this memset() will really require a different patch to get removed ?
>> >
>> > Sigh, not sure why I review patches.
>>
>> Agreed, please use dma_zalloc_coherent() and kill that memset().
>
> Ok, updated. I'll also add cc: stable, because it makes notebooks with
> affected chipset unusable.
Networking patches do not use CC: stable, instead you simply ask me
to queue it up and then I batch submit networking fixes to -stable
periodically myself.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-04 16:21 ` David Miller
@ 2015-12-04 21:30 ` Pavel Machek
2015-12-04 22:01 ` David Miller
0 siblings, 1 reply; 22+ messages in thread
From: Pavel Machek @ 2015-12-04 21:30 UTC (permalink / raw)
To: David Miller
Cc: eric.dumazet, mhocko, akpm, linux-kernel, jcliburn, chris.snook,
netdev, rjw, linux-mm, nic-devel, ronangeles, ebiederm
On Fri 2015-12-04 11:21:40, David Miller wrote:
> From: Pavel Machek <pavel@ucw.cz>
> Date: Fri, 4 Dec 2015 09:11:27 +0100
>
> >> >> 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);
> >> >>
> >> >>
> >> >
> >> > So this memset() will really require a different patch to get removed ?
> >> >
> >> > Sigh, not sure why I review patches.
> >>
> >> Agreed, please use dma_zalloc_coherent() and kill that memset().
> >
> > Ok, updated. I'll also add cc: stable, because it makes notebooks with
> > affected chipset unusable.
>
> Networking patches do not use CC: stable, instead you simply ask me
> to queue it up and then I batch submit networking fixes to -stable
> periodically myself.
Ok, can you take the patch and ignore the Cc, or should I do one more
iteration?
Thanks,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-04 21:30 ` Pavel Machek
@ 2015-12-04 22:01 ` David Miller
0 siblings, 0 replies; 22+ messages in thread
From: David Miller @ 2015-12-04 22:01 UTC (permalink / raw)
To: pavel
Cc: eric.dumazet, mhocko, akpm, linux-kernel, jcliburn, chris.snook,
netdev, rjw, linux-mm, nic-devel, ronangeles, ebiederm
From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 4 Dec 2015 22:30:27 +0100
> On Fri 2015-12-04 11:21:40, David Miller wrote:
>> From: Pavel Machek <pavel@ucw.cz>
>> Date: Fri, 4 Dec 2015 09:11:27 +0100
>>
>> >> >> 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);
>> >> >>
>> >> >>
>> >> >
>> >> > So this memset() will really require a different patch to get removed ?
>> >> >
>> >> > Sigh, not sure why I review patches.
>> >>
>> >> Agreed, please use dma_zalloc_coherent() and kill that memset().
>> >
>> > Ok, updated. I'll also add cc: stable, because it makes notebooks with
>> > affected chipset unusable.
>>
>> Networking patches do not use CC: stable, instead you simply ask me
>> to queue it up and then I batch submit networking fixes to -stable
>> periodically myself.
>
> Ok, can you take the patch and ignore the Cc, or should I do one more
> iteration?
I took care of it.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
2015-12-03 15:59 ` [PATCH net] atl1c: Improve " Pavel Machek
2015-12-03 16:13 ` Michal Hocko
2015-12-03 17:17 ` Eric Dumazet
@ 2015-12-04 8:50 ` Pavel Machek
2 siblings, 0 replies; 22+ messages in thread
From: Pavel Machek @ 2015-12-04 8:50 UTC (permalink / raw)
To: Michal Hocko, davem, Andrew Morton
Cc: kernel list, jcliburn, chris.snook, netdev, Rafael J. Wysocki,
linux-mm, nic-devel, ronangeles, ebiederm
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
^ permalink raw reply related [flat|nested] 22+ messages in thread