Commit 07e0c7d3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: page_pool: merge page_pool_release_page() with page_pool_return_page() 



Now that page_pool_release_page() is not exported we can
merge it with page_pool_return_page(). I believe that
the "Do not replace this with page_pool_return_page()"
comment was there in case page_pool_return_page() was
not inlined, to avoid two function calls.

Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
Reviewed-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Link: https://lore.kernel.org/r/20230720010409.1967072-5-kuba@kernel.org


Reviewed-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 535b9c61

net/core/page_pool.c

+2 −10
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static s32 page_pool_inflight(struct page_pool *pool) 
 * a regular page (that will eventually be returned to the normal

 * page-allocator via put_page).

 */

static void page_pool_release_page(struct page_pool *pool, struct page *page)

static void page_pool_return_page(struct page_pool *pool, struct page *page)

{

	dma_addr_t dma;

	int count;
@@ -518,12 +518,6 @@ static void page_pool_release_page(struct page_pool *pool, struct page *page) 
	 */

	count = atomic_inc_return_relaxed(&pool->pages_state_release_cnt);

	trace_page_pool_state_release(pool, page, count);

}



/* Return a page to the page allocator, cleaning up our state */

static void page_pool_return_page(struct page_pool *pool, struct page *page)

{

	page_pool_release_page(pool, page);



	put_page(page);

	/* An optimization would be to call __free_pages(page, pool->p.order)
@@ -615,9 +609,7 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, 
	 * will be invoking put_page.

	 */

	recycle_stat_inc(pool, released_refcnt);

	/* Do not replace this with page_pool_return_page() */

	page_pool_release_page(pool, page);

	put_page(page);

	page_pool_return_page(pool, page);



	return NULL;

}