* [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users
@ 2021-01-25 16:46 Alexander Lobakin
2021-01-25 16:46 ` [Intel-wired-lan] [PATCH net-next 1/3] mm: constify page_is_pfmemalloc() argument Alexander Lobakin
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Alexander Lobakin @ 2021-01-25 16:46 UTC (permalink / raw)
To: intel-wired-lan
page_is_pfmemalloc() is used mostly by networking drivers. It doesn't
write anything to the struct page itself, so constify its argument and
a bunch of callers and wrappers around this function in drivers.
In Page Pool core code, it can be simply inlined instead.
Alexander Lobakin (3):
mm: constify page_is_pfmemalloc() argument
net: constify page_is_pfmemalloc() argument at call sites
net: page_pool: simplify page recycling condition tests
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-
drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
include/linux/mm.h | 2 +-
include/linux/skbuff.h | 4 ++--
net/core/page_pool.c | 14 ++++----------
13 files changed, 17 insertions(+), 23 deletions(-)
--
2.30.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 1/3] mm: constify page_is_pfmemalloc() argument
2021-01-25 16:46 [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
@ 2021-01-25 16:46 ` Alexander Lobakin
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites Alexander Lobakin
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Alexander Lobakin @ 2021-01-25 16:46 UTC (permalink / raw)
To: intel-wired-lan
The function only tests for page->index, so its argument should be
const.
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
include/linux/mm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ecdf8a8cd6ae..078633d43af9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1584,7 +1584,7 @@ struct address_space *page_mapping_file(struct page *page);
* ALLOC_NO_WATERMARKS and the low watermark was not
* met implying that the system is under some pressure.
*/
-static inline bool page_is_pfmemalloc(struct page *page)
+static inline bool page_is_pfmemalloc(const struct page *page)
{
/*
* Page index cannot be this large so this must be
--
2.30.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites
2021-01-25 16:46 [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
2021-01-25 16:46 ` [Intel-wired-lan] [PATCH net-next 1/3] mm: constify page_is_pfmemalloc() argument Alexander Lobakin
@ 2021-01-25 16:47 ` Alexander Lobakin
2021-01-25 18:19 ` David Rientjes
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests Alexander Lobakin
2021-01-27 20:23 ` [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
3 siblings, 1 reply; 9+ messages in thread
From: Alexander Lobakin @ 2021-01-25 16:47 UTC (permalink / raw)
To: intel-wired-lan
Constify "page" argument for page_is_pfmemalloc() users where applicable.
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-
drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
include/linux/skbuff.h | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 512080640cbc..0f8e962b5010 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2800,7 +2800,7 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,
writel(i, ring->tqp->io_base + HNS3_RING_RX_RING_HEAD_REG);
}
-static bool hns3_page_is_reusable(struct page *page)
+static bool hns3_page_is_reusable(const struct page *page)
{
return page_to_nid(page) == numa_mem_id() &&
!page_is_pfmemalloc(page);
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 99b8252eb969..32fcb7a51b5d 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -194,7 +194,7 @@ static void fm10k_reuse_rx_page(struct fm10k_ring *rx_ring,
DMA_FROM_DEVICE);
}
-static inline bool fm10k_page_is_reserved(struct page *page)
+static inline bool fm10k_page_is_reserved(const struct page *page)
{
return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
}
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 2574e78f7597..3886cddfd856 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1850,7 +1850,7 @@ static bool i40e_cleanup_headers(struct i40e_ring *rx_ring, struct sk_buff *skb,
* A page is not reusable if it was allocated under low memory
* conditions, or it's not in the same NUMA node as this CPU.
*/
-static inline bool i40e_page_is_reusable(struct page *page)
+static inline bool i40e_page_is_reusable(const struct page *page)
{
return (page_to_nid(page) == numa_mem_id()) &&
!page_is_pfmemalloc(page);
diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
index 256fa07d54d5..d9ba8433c911 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
@@ -1148,7 +1148,7 @@ static void iavf_reuse_rx_page(struct iavf_ring *rx_ring,
* A page is not reusable if it was allocated under low memory
* conditions, or it's not in the same NUMA node as this CPU.
*/
-static inline bool iavf_page_is_reusable(struct page *page)
+static inline bool iavf_page_is_reusable(const struct page *page)
{
return (page_to_nid(page) == numa_mem_id()) &&
!page_is_pfmemalloc(page);
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 422f53997c02..ecbf94cb11ea 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -732,7 +732,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)
* ice_page_is_reserved - check if reuse is possible
* @page: page struct to check
*/
-static bool ice_page_is_reserved(struct page *page)
+static bool ice_page_is_reserved(const struct page *page)
{
return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
}
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 84d4284b8b32..5e1aa7d04bf7 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -8215,7 +8215,7 @@ static void igb_reuse_rx_page(struct igb_ring *rx_ring,
new_buff->pagecnt_bias = old_buff->pagecnt_bias;
}
-static inline bool igb_page_is_reserved(struct page *page)
+static inline bool igb_page_is_reserved(const struct page *page)
{
return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
}
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 43aec42e6d9d..2939a3a4fa00 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1648,7 +1648,7 @@ static void igc_reuse_rx_page(struct igc_ring *rx_ring,
new_buff->pagecnt_bias = old_buff->pagecnt_bias;
}
-static inline bool igc_page_is_reserved(struct page *page)
+static inline bool igc_page_is_reserved(const struct page *page)
{
return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e08c01525fd2..e2cd995512b1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1940,7 +1940,7 @@ static void ixgbe_reuse_rx_page(struct ixgbe_ring *rx_ring,
new_buff->pagecnt_bias = old_buff->pagecnt_bias;
}
-static inline bool ixgbe_page_is_reserved(struct page *page)
+static inline bool ixgbe_page_is_reserved(const struct page *page)
{
return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
}
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index a14e55e7fce8..b4fb6bee1bb0 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -781,7 +781,7 @@ static void ixgbevf_reuse_rx_page(struct ixgbevf_ring *rx_ring,
new_buff->pagecnt_bias = old_buff->pagecnt_bias;
}
-static inline bool ixgbevf_page_is_reserved(struct page *page)
+static inline bool ixgbevf_page_is_reserved(const struct page *page)
{
return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index dec93d57542f..9fff677026b7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -212,7 +212,7 @@ static inline u32 mlx5e_decompress_cqes_start(struct mlx5e_rq *rq,
return mlx5e_decompress_cqes_cont(rq, wq, 1, budget_rem) - 1;
}
-static inline bool mlx5e_page_is_reserved(struct page *page)
+static inline bool mlx5e_page_is_reserved(const struct page *page)
{
return page_is_pfmemalloc(page) || page_to_nid(page) != numa_mem_id();
}
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 9313b5aaf45b..b027526da4f9 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2943,8 +2943,8 @@ static inline struct page *dev_alloc_page(void)
* @page: The page that was allocated from skb_alloc_page
* @skb: The skb that may need pfmemalloc set
*/
-static inline void skb_propagate_pfmemalloc(struct page *page,
- struct sk_buff *skb)
+static inline void skb_propagate_pfmemalloc(const struct page *page,
+ struct sk_buff *skb)
{
if (page_is_pfmemalloc(page))
skb->pfmemalloc = true;
--
2.30.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests
2021-01-25 16:46 [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
2021-01-25 16:46 ` [Intel-wired-lan] [PATCH net-next 1/3] mm: constify page_is_pfmemalloc() argument Alexander Lobakin
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites Alexander Lobakin
@ 2021-01-25 16:47 ` Alexander Lobakin
2021-01-25 19:22 ` Jesper Dangaard Brouer
2021-01-26 11:08 ` Ilias Apalodimas
2021-01-27 20:23 ` [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
3 siblings, 2 replies; 9+ messages in thread
From: Alexander Lobakin @ 2021-01-25 16:47 UTC (permalink / raw)
To: intel-wired-lan
pool_page_reusable() is a leftover from pre-NUMA-aware times. For now,
this function is just a redundant wrapper over page_is_pfmemalloc(),
so Inline it into its sole call site.
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
net/core/page_pool.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index f3c690b8c8e3..ad8b0707af04 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -350,14 +350,6 @@ static bool page_pool_recycle_in_cache(struct page *page,
return true;
}
-/* page is NOT reusable when:
- * 1) allocated when system is under some pressure. (page_is_pfmemalloc)
- */
-static bool pool_page_reusable(struct page_pool *pool, struct page *page)
-{
- return !page_is_pfmemalloc(page);
-}
-
/* If the page refcnt == 1, this will try to recycle the page.
* if PP_FLAG_DMA_SYNC_DEV is set, we'll try to sync the DMA area for
* the configured size min(dma_sync_size, pool->max_len).
@@ -373,9 +365,11 @@ __page_pool_put_page(struct page_pool *pool, struct page *page,
* regular page allocator APIs.
*
* refcnt == 1 means page_pool owns page, and can recycle it.
+ *
+ * page is NOT reusable when allocated when system is under
+ * some pressure. (page_is_pfmemalloc)
*/
- if (likely(page_ref_count(page) == 1 &&
- pool_page_reusable(pool, page))) {
+ if (likely(page_ref_count(page) == 1 && !page_is_pfmemalloc(page))) {
/* Read barrier done in page_ref_count / READ_ONCE */
if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
--
2.30.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites Alexander Lobakin
@ 2021-01-25 18:19 ` David Rientjes
2021-01-25 18:27 ` Alexander Lobakin
0 siblings, 1 reply; 9+ messages in thread
From: David Rientjes @ 2021-01-25 18:19 UTC (permalink / raw)
To: intel-wired-lan
On Mon, 25 Jan 2021, Alexander Lobakin wrote:
> Constify "page" argument for page_is_pfmemalloc() users where applicable.
>
> Signed-off-by: Alexander Lobakin <alobakin@pm.me>
> ---
> drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
> drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
> drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-
> drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-
> drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
> include/linux/skbuff.h | 4 ++--
> 11 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> index 512080640cbc..0f8e962b5010 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> @@ -2800,7 +2800,7 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,
> writel(i, ring->tqp->io_base + HNS3_RING_RX_RING_HEAD_REG);
> }
>
> -static bool hns3_page_is_reusable(struct page *page)
> +static bool hns3_page_is_reusable(const struct page *page)
> {
> return page_to_nid(page) == numa_mem_id() &&
> !page_is_pfmemalloc(page);
Hi Alexander,
All of these functions appear to be doing the same thing, would it make
sense to simply add this to a header file and remove all the code
duplication as well?
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites
2021-01-25 18:19 ` David Rientjes
@ 2021-01-25 18:27 ` Alexander Lobakin
0 siblings, 0 replies; 9+ messages in thread
From: Alexander Lobakin @ 2021-01-25 18:27 UTC (permalink / raw)
To: intel-wired-lan
From: David Rientjes <rientjes@google.com>
Date: Mon, 25 Jan 2021 10:19:48 -0800 (PST)
> On Mon, 25 Jan 2021, Alexander Lobakin wrote:
>
> > Constify "page" argument for page_is_pfmemalloc() users where applicable.
> >
> > Signed-off-by: Alexander Lobakin <alobakin@pm.me>
> > ---
> > drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
> > drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
> > drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
> > drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-
> > drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-
> > drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> > drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
> > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
> > drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
> > drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
> > include/linux/skbuff.h | 4 ++--
> > 11 files changed, 12 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> > index 512080640cbc..0f8e962b5010 100644
> > --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> > @@ -2800,7 +2800,7 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,
> > writel(i, ring->tqp->io_base + HNS3_RING_RX_RING_HEAD_REG);
> > }
> >
> > -static bool hns3_page_is_reusable(struct page *page)
> > +static bool hns3_page_is_reusable(const struct page *page)
> > {
> > return page_to_nid(page) == numa_mem_id() &&
> > !page_is_pfmemalloc(page);
>
> Hi Alexander,
Hi David!
> All of these functions appear to be doing the same thing, would it make
> sense to simply add this to a header file and remove all the code
> duplication as well?
That's an interesting idea. I'll be glad to do this if drivers'
maintainers agree it's okay for them.
Thanks,
Al
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests Alexander Lobakin
@ 2021-01-25 19:22 ` Jesper Dangaard Brouer
2021-01-26 11:08 ` Ilias Apalodimas
1 sibling, 0 replies; 9+ messages in thread
From: Jesper Dangaard Brouer @ 2021-01-25 19:22 UTC (permalink / raw)
To: intel-wired-lan
On Mon, 25 Jan 2021 16:47:20 +0000
Alexander Lobakin <alobakin@pm.me> wrote:
> pool_page_reusable() is a leftover from pre-NUMA-aware times. For now,
> this function is just a redundant wrapper over page_is_pfmemalloc(),
> so Inline it into its sole call site.
>
> Signed-off-by: Alexander Lobakin <alobakin@pm.me>
> ---
> net/core/page_pool.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
>
> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
> index f3c690b8c8e3..ad8b0707af04 100644
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@ -350,14 +350,6 @@ static bool page_pool_recycle_in_cache(struct page *page,
> return true;
> }
>
> -/* page is NOT reusable when:
> - * 1) allocated when system is under some pressure. (page_is_pfmemalloc)
> - */
> -static bool pool_page_reusable(struct page_pool *pool, struct page *page)
> -{
> - return !page_is_pfmemalloc(page);
> -}
> -
> /* If the page refcnt == 1, this will try to recycle the page.
> * if PP_FLAG_DMA_SYNC_DEV is set, we'll try to sync the DMA area for
> * the configured size min(dma_sync_size, pool->max_len).
> @@ -373,9 +365,11 @@ __page_pool_put_page(struct page_pool *pool, struct page *page,
> * regular page allocator APIs.
> *
> * refcnt == 1 means page_pool owns page, and can recycle it.
> + *
> + * page is NOT reusable when allocated when system is under
> + * some pressure. (page_is_pfmemalloc)
> */
> - if (likely(page_ref_count(page) == 1 &&
> - pool_page_reusable(pool, page))) {
> + if (likely(page_ref_count(page) == 1 && !page_is_pfmemalloc(page))) {
> /* Read barrier done in page_ref_count / READ_ONCE */
>
> if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests Alexander Lobakin
2021-01-25 19:22 ` Jesper Dangaard Brouer
@ 2021-01-26 11:08 ` Ilias Apalodimas
1 sibling, 0 replies; 9+ messages in thread
From: Ilias Apalodimas @ 2021-01-26 11:08 UTC (permalink / raw)
To: intel-wired-lan
On Mon, Jan 25, 2021 at 04:47:20PM +0000, Alexander Lobakin wrote:
> pool_page_reusable() is a leftover from pre-NUMA-aware times. For now,
> this function is just a redundant wrapper over page_is_pfmemalloc(),
> so Inline it into its sole call site.
>
> Signed-off-by: Alexander Lobakin <alobakin@pm.me>
> ---
> net/core/page_pool.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
> index f3c690b8c8e3..ad8b0707af04 100644
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@ -350,14 +350,6 @@ static bool page_pool_recycle_in_cache(struct page *page,
> return true;
> }
>
> -/* page is NOT reusable when:
> - * 1) allocated when system is under some pressure. (page_is_pfmemalloc)
> - */
> -static bool pool_page_reusable(struct page_pool *pool, struct page *page)
> -{
> - return !page_is_pfmemalloc(page);
> -}
> -
> /* If the page refcnt == 1, this will try to recycle the page.
> * if PP_FLAG_DMA_SYNC_DEV is set, we'll try to sync the DMA area for
> * the configured size min(dma_sync_size, pool->max_len).
> @@ -373,9 +365,11 @@ __page_pool_put_page(struct page_pool *pool, struct page *page,
> * regular page allocator APIs.
> *
> * refcnt == 1 means page_pool owns page, and can recycle it.
> + *
> + * page is NOT reusable when allocated when system is under
> + * some pressure. (page_is_pfmemalloc)
> */
> - if (likely(page_ref_count(page) == 1 &&
> - pool_page_reusable(pool, page))) {
> + if (likely(page_ref_count(page) == 1 && !page_is_pfmemalloc(page))) {
> /* Read barrier done in page_ref_count / READ_ONCE */
>
> if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
> --
> 2.30.0
>
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users
2021-01-25 16:46 [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
` (2 preceding siblings ...)
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests Alexander Lobakin
@ 2021-01-27 20:23 ` Alexander Lobakin
3 siblings, 0 replies; 9+ messages in thread
From: Alexander Lobakin @ 2021-01-27 20:23 UTC (permalink / raw)
To: intel-wired-lan
From: Alexander Lobakin <alobakin@pm.me>
Date: Mon, 25 Jan 2021 16:46:48 +0000
> page_is_pfmemalloc() is used mostly by networking drivers. It doesn't
> write anything to the struct page itself, so constify its argument and
> a bunch of callers and wrappers around this function in drivers.
> In Page Pool core code, it can be simply inlined instead.
>
> Alexander Lobakin (3):
> mm: constify page_is_pfmemalloc() argument
> net: constify page_is_pfmemalloc() argument at call sites
> net: page_pool: simplify page recycling condition tests
Superseded with v2 [0].
> drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
> drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
> drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-
> drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-
> drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
> include/linux/mm.h | 2 +-
> include/linux/skbuff.h | 4 ++--
> net/core/page_pool.c | 14 ++++----------
> 13 files changed, 17 insertions(+), 23 deletions(-)
>
> --
> 2.30.0
[0] https://lore.kernel.org/netdev/20210127201031.98544-1-alobakin at pm.me
Thanks,
Al
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-01-27 20:23 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-25 16:46 [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
2021-01-25 16:46 ` [Intel-wired-lan] [PATCH net-next 1/3] mm: constify page_is_pfmemalloc() argument Alexander Lobakin
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 2/3] net: constify page_is_pfmemalloc() argument at call sites Alexander Lobakin
2021-01-25 18:19 ` David Rientjes
2021-01-25 18:27 ` Alexander Lobakin
2021-01-25 16:47 ` [Intel-wired-lan] [PATCH net-next 3/3] net: page_pool: simplify page recycling condition tests Alexander Lobakin
2021-01-25 19:22 ` Jesper Dangaard Brouer
2021-01-26 11:08 ` Ilias Apalodimas
2021-01-27 20:23 ` [Intel-wired-lan] [PATCH net-next 0/3] net: constify page_is_pfmemalloc() and its users Alexander Lobakin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox