Commit 91a152cb authored by Mina Almasry's avatar Mina Almasry Committed by Jakub Kicinski
Browse files

net: page_pool: rename page_pool_alloc_netmem to *_netmems 



page_pool_alloc_netmem (without an s) was the mirror of
page_pool_alloc_pages (with an s), which was confusing.

Rename to page_pool_alloc_netmems so it's the mirror of
page_pool_alloc_pages.

Signed-off-by: default avatarMina Almasry <almasrymina@google.com>
Acked-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20241211212033.1684197-2-almasrymina@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 36317737

include/net/page_pool/types.h

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ struct page_pool { 
};



struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp);

netmem_ref page_pool_alloc_netmem(struct page_pool *pool, gfp_t gfp);

netmem_ref page_pool_alloc_netmems(struct page_pool *pool, gfp_t gfp);

struct page *page_pool_alloc_frag(struct page_pool *pool, unsigned int *offset,

				  unsigned int size, gfp_t gfp);

netmem_ref page_pool_alloc_frag_netmem(struct page_pool *pool,

net/core/page_pool.c

+4 −4
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static noinline netmem_ref __page_pool_alloc_pages_slow(struct page_pool *pool, 
/* For using page_pool replace: alloc_pages() API calls, but provide

 * synchronization guarantee for allocation side.

 */

netmem_ref page_pool_alloc_netmem(struct page_pool *pool, gfp_t gfp)

netmem_ref page_pool_alloc_netmems(struct page_pool *pool, gfp_t gfp)

{

	netmem_ref netmem;
@@ -590,11 +590,11 @@ netmem_ref page_pool_alloc_netmem(struct page_pool *pool, gfp_t gfp) 
		netmem = __page_pool_alloc_pages_slow(pool, gfp);

	return netmem;

}

EXPORT_SYMBOL(page_pool_alloc_netmem);

EXPORT_SYMBOL(page_pool_alloc_netmems);



struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp)

{

	return netmem_to_page(page_pool_alloc_netmem(pool, gfp));

	return netmem_to_page(page_pool_alloc_netmems(pool, gfp));

}

EXPORT_SYMBOL(page_pool_alloc_pages);

ALLOW_ERROR_INJECTION(page_pool_alloc_pages, NULL);
@@ -992,7 +992,7 @@ netmem_ref page_pool_alloc_frag_netmem(struct page_pool *pool, 
	}



	if (!netmem) {

		netmem = page_pool_alloc_netmem(pool, gfp);

		netmem = page_pool_alloc_netmems(pool, gfp);

		if (unlikely(!netmem)) {

			pool->frag_page = 0;

			return 0;