Message ID | 20231126230740.2148636-2-kuba@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 23cfaf67ba5d2f013d2576b8a9173c45a4a7f895 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: page_pool: add netlink-based introspection | expand |
On Sun, Nov 26, 2023 at 03:07:28PM -0800, Jakub Kicinski wrote: > We'll soon (next change in the series) need a fuller unwind path > in page_pool_create() so create the inverse of page_pool_init(). > > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> > Reviewed-by: Eric Dumazet <edumazet@google.com> > Acked-by: Jesper Dangaard Brouer <hawk@kernel.org> > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Shakeel Butt <shakeelb@google.com>
diff --git a/net/core/page_pool.c b/net/core/page_pool.c index df2a06d7da52..2e4575477e71 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -238,6 +238,18 @@ static int page_pool_init(struct page_pool *pool, return 0; } +static void page_pool_uninit(struct page_pool *pool) +{ + ptr_ring_cleanup(&pool->ring, NULL); + + if (pool->p.flags & PP_FLAG_DMA_MAP) + put_device(pool->p.dev); + +#ifdef CONFIG_PAGE_POOL_STATS + free_percpu(pool->recycle_stats); +#endif +} + /** * page_pool_create() - create a page pool. * @params: parameters, see struct page_pool_params @@ -821,14 +833,7 @@ static void __page_pool_destroy(struct page_pool *pool) if (pool->disconnect) pool->disconnect(pool); - ptr_ring_cleanup(&pool->ring, NULL); - - if (pool->p.flags & PP_FLAG_DMA_MAP) - put_device(pool->p.dev); - -#ifdef CONFIG_PAGE_POOL_STATS - free_percpu(pool->recycle_stats); -#endif + page_pool_uninit(pool); kfree(pool); }