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

Groups > linux.kernel > #1283154 > unrolled thread

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

Started byPavel Machek <pavel@ucw.cz>
First post2015-12-03 17:00 +0100
Last post2015-12-04 10:00 +0100
Articles 9 — 4 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [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

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

FromPavel Machek <pavel@ucw.cz>
Date2015-12-03 17:00 +0100
Subject[PATCH net] atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
Message-ID<qBEsz-75q-23@gated-at.bofh.it>
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
--
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/

[toc] | [next] | [standalone]

#1283163

FromMichal Hocko <mhocko@kernel.org>
Date2015-12-03 17:20 +0100
Message-ID<qBELU-7sA-5@gated-at.bofh.it>
In reply to#1283154
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
--
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/

[toc] | [prev] | [next] | [standalone]

#1283208

FromEric Dumazet <eric.dumazet@gmail.com>
Date2015-12-03 18:20 +0100
Message-ID<qBFHY-83M-17@gated-at.bofh.it>
In reply to#1283154
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.



--
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/

[toc] | [prev] | [next] | [standalone]

#1283216

FromDavid Miller <davem@davemloft.net>
Date2015-12-03 18:40 +0100
Message-ID<qBG1k-8ar-9@gated-at.bofh.it>
In reply to#1283208
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.
--
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/

[toc] | [prev] | [next] | [standalone]

#1283623

FromPavel Machek <pavel@ucw.cz>
Date2015-12-04 09:20 +0100
Message-ID<qBTKV-aS-1@gated-at.bofh.it>
In reply to#1283216
> >>  	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
--
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/

[toc] | [prev] | [next] | [standalone]

#1283995

FromDavid Miller <davem@davemloft.net>
Date2015-12-04 17:30 +0100
Message-ID<qC1pa-54b-73@gated-at.bofh.it>
In reply to#1283623
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.
--
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/

[toc] | [prev] | [next] | [standalone]

#1284246

FromPavel Machek <pavel@ucw.cz>
Date2015-12-04 22:40 +0100
Message-ID<qC6f7-88D-1@gated-at.bofh.it>
In reply to#1283995
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
--
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/

[toc] | [prev] | [next] | [standalone]

#1284284

FromDavid Miller <davem@davemloft.net>
Date2015-12-04 23:10 +0100
Message-ID<qC6Ia-7o-19@gated-at.bofh.it>
In reply to#1284246
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.
--
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/

[toc] | [prev] | [next] | [standalone]

#1283656

FromPavel Machek <pavel@ucw.cz>
Date2015-12-04 10:00 +0100
Message-ID<qBUnF-nU-13@gated-at.bofh.it>
In reply to#1283154
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web