All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
@ 2023-05-09 11:46 Yunsheng Lin
  2023-05-09 18:53 ` Michael Chan
  2023-05-09 23:49 ` Jesse Brandeburg
  0 siblings, 2 replies; 7+ messages in thread
From: Yunsheng Lin @ 2023-05-09 11:46 UTC (permalink / raw)
  To: davem, kuba, pabeni; +Cc: netdev, linux-kernel

The remaining users calling __skb_frag_set_page() with
page being NULL seems to be doing defensive programming,
as shinfo->nr_frags is already decremented, so remove
them.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
---
RFC: remove a local variable as pointed out by Simon.
---
 drivers/net/ethernet/broadcom/bnx2.c      |  1 -
 drivers/net/ethernet/broadcom/bnxt/bnxt.c |  5 +----
 include/linux/skbuff.h                    | 12 ------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 466e1d62bcf6..0d917a9699c5 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -2955,7 +2955,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,
 		shinfo = skb_shinfo(skb);
 		shinfo->nr_frags--;
 		page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]);
-		__skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL);
 
 		cons_rx_pg->page = page;
 		dev_kfree_skb(skb);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index efaff5018af8..f42e51bd3e42 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1102,10 +1102,7 @@ static u32 __bnxt_rx_agg_pages(struct bnxt *bp,
 			xdp_buff_set_frag_pfmemalloc(xdp);
 
 		if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_ATOMIC) != 0) {
-			unsigned int nr_frags;
-
-			nr_frags = --shinfo->nr_frags;
-			__skb_frag_set_page(&shinfo->frags[nr_frags], NULL);
+			--shinfo->nr_frags;
 			cons_rx_buf->page = page;
 
 			/* Update prod since possibly some pages have been
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 30be21c7d05f..00e8c435fa1a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3491,18 +3491,6 @@ static inline void skb_frag_page_copy(skb_frag_t *fragto,
 	fragto->bv_page = fragfrom->bv_page;
 }
 
-/**
- * __skb_frag_set_page - sets the page contained in a paged fragment
- * @frag: the paged fragment
- * @page: the page to set
- *
- * Sets the fragment @frag to contain @page.
- */
-static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)
-{
-	frag->bv_page = page;
-}
-
 bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio);
 
 /**
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
  2023-05-09 11:46 [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Yunsheng Lin
@ 2023-05-09 18:53 ` Michael Chan
  2023-05-09 23:49 ` Jesse Brandeburg
  1 sibling, 0 replies; 7+ messages in thread
From: Michael Chan @ 2023-05-09 18:53 UTC (permalink / raw)
  To: Yunsheng Lin; +Cc: davem, kuba, pabeni, netdev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

On Tue, May 9, 2023 at 4:48 AM Yunsheng Lin <linyunsheng@huawei.com> wrote:
>
> The remaining users calling __skb_frag_set_page() with
> page being NULL seems to be doing defensive programming,
> as shinfo->nr_frags is already decremented, so remove
> them.
>
> Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>

Thanks.
Reviewed-by: Michael Chan <michael.chan@broadcom.com>

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
  2023-05-09 11:46 [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Yunsheng Lin
  2023-05-09 18:53 ` Michael Chan
@ 2023-05-09 23:49 ` Jesse Brandeburg
  2023-05-10  8:16   ` Simon Horman
  1 sibling, 1 reply; 7+ messages in thread
From: Jesse Brandeburg @ 2023-05-09 23:49 UTC (permalink / raw)
  To: Yunsheng Lin, davem, kuba, pabeni; +Cc: netdev, linux-kernel, Simon Horman

On 5/9/2023 4:46 AM, Yunsheng Lin wrote:
> The remaining users calling __skb_frag_set_page() with
> page being NULL seems to be doing defensive programming,
> as shinfo->nr_frags is already decremented, so remove
> them.
> 
> Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
> ---
> RFC: remove a local variable as pointed out by Simon.

Makes sense.

Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

CC: Simon




^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
  2023-05-09 23:49 ` Jesse Brandeburg
@ 2023-05-10  8:16   ` Simon Horman
  0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2023-05-10  8:16 UTC (permalink / raw)
  To: Jesse Brandeburg; +Cc: Yunsheng Lin, davem, kuba, pabeni, netdev, linux-kernel

On Tue, May 09, 2023 at 04:49:46PM -0700, Jesse Brandeburg wrote:
> On 5/9/2023 4:46 AM, Yunsheng Lin wrote:
> > The remaining users calling __skb_frag_set_page() with
> > page being NULL seems to be doing defensive programming,
> > as shinfo->nr_frags is already decremented, so remove
> > them.
> > 
> > Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
> > ---
> > RFC: remove a local variable as pointed out by Simon.
> 
> Makes sense.
> 
> Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> 
> CC: Simon

Thanks Yunsheng and Jessee,

this looks good to me.

Reviewed-by: Simon Horman <simon.horman@corigine.com>


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
  2023-05-09 11:43 ` [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Yunsheng Lin
@ 2023-05-09 13:41   ` Leon Romanovsky
  0 siblings, 0 replies; 7+ messages in thread
From: Leon Romanovsky @ 2023-05-09 13:41 UTC (permalink / raw)
  To: Yunsheng Lin; +Cc: davem, kuba, pabeni, netdev, linux-kernel

On Tue, May 09, 2023 at 07:43:37PM +0800, Yunsheng Lin wrote:
> The remaining users calling __skb_frag_set_page() with
> page being NULL seems to be doing defensive programming,
> as shinfo->nr_frags is already decremented, so remove
> them.
> 
> Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
> ---
> RFC: remove a local variable as pointed out by Simon.
> ---
>  drivers/net/ethernet/broadcom/bnx2.c      |  1 -
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  5 +----
>  include/linux/skbuff.h                    | 12 ------------
>  3 files changed, 1 insertion(+), 17 deletions(-)
> 

Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
  2023-05-09 11:43 [PATCH net-next v1 0/2] introduce skb_frag_fill_page_desc() Yunsheng Lin
@ 2023-05-09 11:43 ` Yunsheng Lin
  2023-05-09 13:41   ` Leon Romanovsky
  0 siblings, 1 reply; 7+ messages in thread
From: Yunsheng Lin @ 2023-05-09 11:43 UTC (permalink / raw)
  To: davem, kuba, pabeni; +Cc: netdev, linux-kernel

The remaining users calling __skb_frag_set_page() with
page being NULL seems to be doing defensive programming,
as shinfo->nr_frags is already decremented, so remove
them.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
---
RFC: remove a local variable as pointed out by Simon.
---
 drivers/net/ethernet/broadcom/bnx2.c      |  1 -
 drivers/net/ethernet/broadcom/bnxt/bnxt.c |  5 +----
 include/linux/skbuff.h                    | 12 ------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 466e1d62bcf6..0d917a9699c5 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -2955,7 +2955,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,
 		shinfo = skb_shinfo(skb);
 		shinfo->nr_frags--;
 		page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]);
-		__skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL);
 
 		cons_rx_pg->page = page;
 		dev_kfree_skb(skb);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index efaff5018af8..f42e51bd3e42 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1102,10 +1102,7 @@ static u32 __bnxt_rx_agg_pages(struct bnxt *bp,
 			xdp_buff_set_frag_pfmemalloc(xdp);
 
 		if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_ATOMIC) != 0) {
-			unsigned int nr_frags;
-
-			nr_frags = --shinfo->nr_frags;
-			__skb_frag_set_page(&shinfo->frags[nr_frags], NULL);
+			--shinfo->nr_frags;
 			cons_rx_buf->page = page;
 
 			/* Update prod since possibly some pages have been
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 30be21c7d05f..00e8c435fa1a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3491,18 +3491,6 @@ static inline void skb_frag_page_copy(skb_frag_t *fragto,
 	fragto->bv_page = fragfrom->bv_page;
 }
 
-/**
- * __skb_frag_set_page - sets the page contained in a paged fragment
- * @frag: the paged fragment
- * @page: the page to set
- *
- * Sets the fragment @frag to contain @page.
- */
-static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)
-{
-	frag->bv_page = page;
-}
-
 bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio);
 
 /**
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH net-next v1 2/2] net: remove __skb_frag_set_page()
  2023-05-09 11:42 [PATCH net-next v1 0/2] introduce skb_frag_fill_page_desc() Yunsheng Lin
@ 2023-05-09 11:42 ` Yunsheng Lin
  0 siblings, 0 replies; 7+ messages in thread
From: Yunsheng Lin @ 2023-05-09 11:42 UTC (permalink / raw)
  To: davem, kuba, pabeni; +Cc: netdev, linux-kernel

The remaining users calling __skb_frag_set_page() with
page being NULL seems to be doing defensive programming,
as shinfo->nr_frags is already decremented, so remove
them.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
---
RFC: remove a local variable as pointed out by Simon.
---
 drivers/net/ethernet/broadcom/bnx2.c      |  1 -
 drivers/net/ethernet/broadcom/bnxt/bnxt.c |  5 +----
 include/linux/skbuff.h                    | 12 ------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 466e1d62bcf6..0d917a9699c5 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -2955,7 +2955,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,
 		shinfo = skb_shinfo(skb);
 		shinfo->nr_frags--;
 		page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]);
-		__skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL);
 
 		cons_rx_pg->page = page;
 		dev_kfree_skb(skb);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index efaff5018af8..f42e51bd3e42 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1102,10 +1102,7 @@ static u32 __bnxt_rx_agg_pages(struct bnxt *bp,
 			xdp_buff_set_frag_pfmemalloc(xdp);
 
 		if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_ATOMIC) != 0) {
-			unsigned int nr_frags;
-
-			nr_frags = --shinfo->nr_frags;
-			__skb_frag_set_page(&shinfo->frags[nr_frags], NULL);
+			--shinfo->nr_frags;
 			cons_rx_buf->page = page;
 
 			/* Update prod since possibly some pages have been
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 30be21c7d05f..00e8c435fa1a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3491,18 +3491,6 @@ static inline void skb_frag_page_copy(skb_frag_t *fragto,
 	fragto->bv_page = fragfrom->bv_page;
 }
 
-/**
- * __skb_frag_set_page - sets the page contained in a paged fragment
- * @frag: the paged fragment
- * @page: the page to set
- *
- * Sets the fragment @frag to contain @page.
- */
-static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)
-{
-	frag->bv_page = page;
-}
-
 bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio);
 
 /**
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-05-10  8:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-09 11:46 [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Yunsheng Lin
2023-05-09 18:53 ` Michael Chan
2023-05-09 23:49 ` Jesse Brandeburg
2023-05-10  8:16   ` Simon Horman
  -- strict thread matches above, loose matches on Subject: below --
2023-05-09 11:43 [PATCH net-next v1 0/2] introduce skb_frag_fill_page_desc() Yunsheng Lin
2023-05-09 11:43 ` [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Yunsheng Lin
2023-05-09 13:41   ` Leon Romanovsky
2023-05-09 11:42 [PATCH net-next v1 0/2] introduce skb_frag_fill_page_desc() Yunsheng Lin
2023-05-09 11:42 ` [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Yunsheng Lin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.