2023-10-30 09:17:35

by Jijie Shao

Subject: [PATCH net] net: page_pool: add missing free_percpu when page_pool_init fail

From: Jian Shen <[email protected]>

When ptr_ring_init() returns failure in page_pool_init(), free_percpu()
is not called to free pool->recycle_stats, which may cause memory
leak.

Fixes: ad6fa1e1ab1b ("page_pool: Add recycle stats")
Signed-off-by: Jian Shen <[email protected]>
Signed-off-by: Jijie Shao <[email protected]>
---
net/core/page_pool.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 77cb75e63aca..31f923e7b5c4 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -221,8 +221,12 @@ static int page_pool_init(struct page_pool *pool,
return -ENOMEM;
#endif

- if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0)
+ if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) {
+#ifdef CONFIG_PAGE_POOL_STATS
+ free_percpu(pool->recycle_stats);
+#endif
return -ENOMEM;
+ }

atomic_set(&pool->pages_state_release_cnt, 0);

--
2.30.0

2023-10-30 09:31:44

by Yunsheng Lin

Subject: Re: [PATCH net] net: page_pool: add missing free_percpu when page_pool_init fail

On 2023/10/30 17:12, Jijie Shao wrote:
> From: Jian Shen <[email protected]>
>
> When ptr_ring_init() returns failure in page_pool_init(), free_percpu()
> is not called to free pool->recycle_stats, which may cause memory
> leak.

LGTM.
Reviewed-by: Yunsheng Lin <[email protected]>

>
> Fixes: ad6fa1e1ab1b ("page_pool: Add recycle stats")
> Signed-off-by: Jian Shen <[email protected]>
> Signed-off-by: Jijie Shao <[email protected]>
> ---
> net/core/page_pool.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
> index 77cb75e63aca..31f923e7b5c4 100644
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@ -221,8 +221,12 @@ static int page_pool_init(struct page_pool *pool,
> return -ENOMEM;
> #endif
>
> - if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0)
> + if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) {
> +#ifdef CONFIG_PAGE_POOL_STATS
> + free_percpu(pool->recycle_stats);
> +#endif
> return -ENOMEM;
> + }
>
> atomic_set(&pool->pages_state_release_cnt, 0);
>
>

2023-10-30 12:07:27

by Jiri Pirko

Subject: Re: [PATCH net] net: page_pool: add missing free_percpu when page_pool_init fail

Mon, Oct 30, 2023 at 10:12:56AM CET, [email protected] wrote:
>From: Jian Shen <[email protected]>
>
>When ptr_ring_init() returns failure in page_pool_init(), free_percpu()
>is not called to free pool->recycle_stats, which may cause memory
>leak.

Would be nice to see the use of imperative mood in the patch description
too, not only patch subject. Nevertheless, fix looks fine:

Reviewed-by: Jiri Pirko <[email protected]>

2023-11-01 11:11:58

by Ilias Apalodimas

Subject: Re: [PATCH net] net: page_pool: add missing free_percpu when page_pool_init fail

On Mon, 30 Oct 2023 at 11:17, Jijie Shao <[email protected]> wrote:
>
> From: Jian Shen <[email protected]>
>
> When ptr_ring_init() returns failure in page_pool_init(), free_percpu()
> is not called to free pool->recycle_stats, which may cause memory
> leak.
>
> Fixes: ad6fa1e1ab1b ("page_pool: Add recycle stats")
> Signed-off-by: Jian Shen <[email protected]>
> Signed-off-by: Jijie Shao <[email protected]>
> ---
> net/core/page_pool.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
> index 77cb75e63aca..31f923e7b5c4 100644
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@ -221,8 +221,12 @@ static int page_pool_init(struct page_pool *pool,
> return -ENOMEM;
> #endif
>
> - if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0)
> + if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) {
> +#ifdef CONFIG_PAGE_POOL_STATS
> + free_percpu(pool->recycle_stats);
> +#endif
> return -ENOMEM;
> + }
>
> atomic_set(&pool->pages_state_release_cnt, 0);
>
> --
> 2.30.0
>
Reviewed-by: Ilias Apalodimas <[email protected]>

2023-11-02 11:51:17

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: page_pool: add missing free_percpu when page_pool_init fail

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

On Mon, 30 Oct 2023 17:12:56 +0800 you wrote:
> From: Jian Shen <[email protected]>
>
> When ptr_ring_init() returns failure in page_pool_init(), free_percpu()
> is not called to free pool->recycle_stats, which may cause memory
> leak.
>
> Fixes: ad6fa1e1ab1b ("page_pool: Add recycle stats")
> Signed-off-by: Jian Shen <[email protected]>
> Signed-off-by: Jijie Shao <[email protected]>
>
> [...]

Here is the summary with links:
- [net] net: page_pool: add missing free_percpu when page_pool_init fail
https://git.kernel.org/netdev/net/c/8ffbd1669ed1

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