Commit efb3e0e1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'introduce-page_pool_alloc-related-api' 

Yunsheng Lin says:

====================
introduce page_pool_alloc() related API

In [1] & [2] & [3], there are usecases for veth and virtio_net
to use frag support in page pool to reduce memory usage, and it
may request different frag size depending on the head/tail
room space for xdp_frame/shinfo and mtu/packet size. When the
requested frag size is large enough that a single page can not
be split into more than one frag, using frag support only have
performance penalty because of the extra frag count handling
for frag support.

So this patchset provides a page pool API for the driver to
allocate memory with least memory utilization and performance
penalty when it doesn't know the size of memory it need
beforehand.

1. https://patchwork.kernel.org/project/netdevbpf/patch/d3ae6bd3537fbce379382ac6a42f67e22f27ece2.1683896626.git.lorenzo@kernel.org/
2. https://patchwork.kernel.org/project/netdevbpf/patch/20230526054621.18371-3-liangchen.linux@gmail.com/
3. https://github.com/alobakin/linux/tree/iavf-pp-frag
====================

Link: https://lore.kernel.org/r/20231020095952.11055-1-linyunsheng@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f4dbc2bb 2d0de67d

Documentation/networking/page_pool.rst

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ a page will cause no race conditions is enough. 


.. kernel-doc:: include/net/page_pool/helpers.h

   :identifiers: page_pool_put_page page_pool_put_full_page

		 page_pool_recycle_direct page_pool_dev_alloc_pages

		 page_pool_recycle_direct page_pool_free_va

		 page_pool_dev_alloc_pages page_pool_dev_alloc_frag

		 page_pool_dev_alloc page_pool_dev_alloc_va

		 page_pool_get_dma_addr page_pool_get_dma_dir



.. kernel-doc:: net/core/page_pool.c

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+0 −2
Original line number Diff line number Diff line
@@ -3302,8 +3302,6 @@ static int bnxt_alloc_rx_page_pool(struct bnxt *bp, 
	pp.dma_dir = bp->rx_dir;

	pp.max_len = PAGE_SIZE;

	pp.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;

	if (PAGE_SIZE > BNXT_RX_PAGE_SIZE)

		pp.flags |= PP_FLAG_PAGE_FRAG;



	rxr->page_pool = page_pool_create(&pp);

	if (IS_ERR(rxr->page_pool)) {

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+1 −2
Original line number Diff line number Diff line
@@ -4940,8 +4940,7 @@ static void hns3_put_ring_config(struct hns3_nic_priv *priv) 
static void hns3_alloc_page_pool(struct hns3_enet_ring *ring)

{

	struct page_pool_params pp_params = {

		.flags = PP_FLAG_DMA_MAP | PP_FLAG_PAGE_FRAG |

				PP_FLAG_DMA_SYNC_DEV,

		.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV,

		.order = hns3_page_order(ring),

		.pool_size = ring->desc_num * hns3_buf_size(ring) /

				(PAGE_SIZE << hns3_page_order(ring)),

drivers/net/ethernet/intel/idpf/idpf_txrx.c

+0 −3
Original line number Diff line number Diff line
@@ -595,9 +595,6 @@ static struct page_pool *idpf_rx_create_page_pool(struct idpf_queue *rxbufq) 
		.offset		= 0,

	};



	if (rxbufq->rx_buf_size == IDPF_RX_BUF_2048)

		pp.flags |= PP_FLAG_PAGE_FRAG;



	return page_pool_create(&pp);

}

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ int otx2_pool_init(struct otx2_nic *pfvf, u16 pool_id, 
	}



	pp_params.order = get_order(buf_size);

	pp_params.flags = PP_FLAG_PAGE_FRAG | PP_FLAG_DMA_MAP;

	pp_params.flags = PP_FLAG_DMA_MAP;

	pp_params.pool_size = min(OTX2_PAGE_POOL_SZ, numptrs);

	pp_params.nid = NUMA_NO_NODE;

	pp_params.dev = pfvf->dev;