LKML Archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()'
@ 2021-04-04 12:42 Christophe JAILLET
  2021-04-04 12:42 ` [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it Christophe JAILLET
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Christophe JAILLET @ 2021-04-04 12:42 UTC (permalink / raw)
  To: aelior, GR-everest-linux-l2, davem, kuba
  Cc: netdev, linux-kernel, kernel-janitors, Christophe JAILLET

This ++ is confusing. It looks duplicated with the one already performed in
'skb_fill_page_desc()'.

In fact, it is harmless. 'nr_frags' is written twice with the same value.
Once, because of the nr_frags++, and once because of the 'nr_frags = i + 1'
in 'skb_fill_page_desc()'.

So axe this post-increment to avoid confusion.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/ethernet/qlogic/qede/qede_fp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c
index 102d0e0808d5..ee3e45e38cb7 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_fp.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c
@@ -1209,7 +1209,7 @@ static int qede_rx_build_jumbo(struct qede_dev *edev,
 		dma_unmap_page(rxq->dev, bd->mapping,
 			       PAGE_SIZE, DMA_FROM_DEVICE);
 
-		skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags++,
+		skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
 				   bd->data, rxq->rx_headroom, cur_size);
 
 		skb->truesize += PAGE_SIZE;
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it
  2021-04-04 12:42 [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Christophe JAILLET
@ 2021-04-04 12:42 ` Christophe JAILLET
  2021-04-05 10:07   ` [EXT] " Manish Chopra
  2021-04-05 10:01 ` [EXT] [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Manish Chopra
  2021-04-05 20:00 ` patchwork-bot+netdevbpf
  2 siblings, 1 reply; 5+ messages in thread
From: Christophe JAILLET @ 2021-04-04 12:42 UTC (permalink / raw)
  To: aelior, GR-everest-linux-l2, davem, kuba
  Cc: netdev, linux-kernel, kernel-janitors, Christophe JAILLET

Some lines of code can be merged into an equivalent 'skb_add_rx_frag()'
call which is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/ethernet/qlogic/qede/qede_fp.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c
index ee3e45e38cb7..8e150dd4f899 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_fp.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c
@@ -1209,12 +1209,9 @@ static int qede_rx_build_jumbo(struct qede_dev *edev,
 		dma_unmap_page(rxq->dev, bd->mapping,
 			       PAGE_SIZE, DMA_FROM_DEVICE);
 
-		skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-				   bd->data, rxq->rx_headroom, cur_size);
+		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, bd->data,
+				rxq->rx_headroom, cur_size, PAGE_SIZE);
 
-		skb->truesize += PAGE_SIZE;
-		skb->data_len += cur_size;
-		skb->len += cur_size;
 		pkt_len -= cur_size;
 	}
 
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* RE: [EXT] [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()'
  2021-04-04 12:42 [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Christophe JAILLET
  2021-04-04 12:42 ` [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it Christophe JAILLET
@ 2021-04-05 10:01 ` Manish Chopra
  2021-04-05 20:00 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 5+ messages in thread
From: Manish Chopra @ 2021-04-05 10:01 UTC (permalink / raw)
  To: Christophe JAILLET, Ariel Elior, GR-everest-linux-l2,
	davem@davemloft.net, kuba@kernel.org
  Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org

> -----Original Message-----
> From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Sent: Sunday, April 4, 2021 6:13 PM
> To: Ariel Elior <aelior@marvell.com>; GR-everest-linux-l2 <GR-everest-linux-
> l2@marvell.com>; davem@davemloft.net; kuba@kernel.org
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; kernel-
> janitors@vger.kernel.org; Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Subject: [EXT] [PATCH 1/2] qede: Remove a erroneous ++ in
> 'qede_rx_build_jumbo()'
> 
> External Email
> 
> ----------------------------------------------------------------------
> This ++ is confusing. It looks duplicated with the one already performed in
> 'skb_fill_page_desc()'.
> 
> In fact, it is harmless. 'nr_frags' is written twice with the same value.
> Once, because of the nr_frags++, and once because of the 'nr_frags = i + 1'
> in 'skb_fill_page_desc()'.
> 
> So axe this post-increment to avoid confusion.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/net/ethernet/qlogic/qede/qede_fp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c
> b/drivers/net/ethernet/qlogic/qede/qede_fp.c
> index 102d0e0808d5..ee3e45e38cb7 100644
> --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c
> +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c
> @@ -1209,7 +1209,7 @@ static int qede_rx_build_jumbo(struct qede_dev
> *edev,
>  		dma_unmap_page(rxq->dev, bd->mapping,
>  			       PAGE_SIZE, DMA_FROM_DEVICE);
> 
> -		skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags++,
> +		skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
>  				   bd->data, rxq->rx_headroom, cur_size);
> 
>  		skb->truesize += PAGE_SIZE;
> --
> 2.27.0

Acked-by: Manish Chopra <manishc@marvell.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [EXT] [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it
  2021-04-04 12:42 ` [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it Christophe JAILLET
@ 2021-04-05 10:07   ` Manish Chopra
  0 siblings, 0 replies; 5+ messages in thread
From: Manish Chopra @ 2021-04-05 10:07 UTC (permalink / raw)
  To: Christophe JAILLET, Ariel Elior, GR-everest-linux-l2,
	davem@davemloft.net, kuba@kernel.org
  Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org

> -----Original Message-----
> From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Sent: Sunday, April 4, 2021 6:13 PM
> To: Ariel Elior <aelior@marvell.com>; GR-everest-linux-l2 <GR-everest-linux-
> l2@marvell.com>; davem@davemloft.net; kuba@kernel.org
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; kernel-
> janitors@vger.kernel.org; Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Subject: [EXT] [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding
> it
> 
> External Email
> 
> ----------------------------------------------------------------------
> Some lines of code can be merged into an equivalent 'skb_add_rx_frag()'
> call which is less verbose.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/net/ethernet/qlogic/qede/qede_fp.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c
> b/drivers/net/ethernet/qlogic/qede/qede_fp.c
> index ee3e45e38cb7..8e150dd4f899 100644
> --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c
> +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c
> @@ -1209,12 +1209,9 @@ static int qede_rx_build_jumbo(struct qede_dev
> *edev,
>  		dma_unmap_page(rxq->dev, bd->mapping,
>  			       PAGE_SIZE, DMA_FROM_DEVICE);
> 
> -		skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
> -				   bd->data, rxq->rx_headroom, cur_size);
> +		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, bd->data,
> +				rxq->rx_headroom, cur_size, PAGE_SIZE);
> 
> -		skb->truesize += PAGE_SIZE;
> -		skb->data_len += cur_size;
> -		skb->len += cur_size;
>  		pkt_len -= cur_size;
>  	}
> 
> --
> 2.27.0

Thank you Christophe.
Acked-by: Manish Chopra <manishc@marvell.com>



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()'
  2021-04-04 12:42 [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Christophe JAILLET
  2021-04-04 12:42 ` [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it Christophe JAILLET
  2021-04-05 10:01 ` [EXT] [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Manish Chopra
@ 2021-04-05 20:00 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-04-05 20:00 UTC (permalink / raw)
  To: Christophe JAILLET
  Cc: aelior, GR-everest-linux-l2, davem, kuba, netdev, linux-kernel,
	kernel-janitors

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Sun,  4 Apr 2021 14:42:44 +0200 you wrote:
> This ++ is confusing. It looks duplicated with the one already performed in
> 'skb_fill_page_desc()'.
> 
> In fact, it is harmless. 'nr_frags' is written twice with the same value.
> Once, because of the nr_frags++, and once because of the 'nr_frags = i + 1'
> in 'skb_fill_page_desc()'.
> 
> [...]

Here is the summary with links:
  - [1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()'
    https://git.kernel.org/netdev/net-next/c/1ec3d02f9cdf
  - [2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it
    https://git.kernel.org/netdev/net-next/c/7190e9d8e131

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-04-05 20:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-04 12:42 [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Christophe JAILLET
2021-04-04 12:42 ` [PATCH 2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it Christophe JAILLET
2021-04-05 10:07   ` [EXT] " Manish Chopra
2021-04-05 10:01 ` [EXT] [PATCH 1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' Manish Chopra
2021-04-05 20:00 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).