Commit a385b1bd authored by Yunsheng Lin's avatar Yunsheng Lin Committed by Zheng Zengkai
Browse files

net: hns3: add option to turn off page pool feature 

mainline inclusion
from mainline-v5.15-rc2
commit f7ec554b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4CVS3
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f7ec554b73c5



----------------------------------------------------------------------

When page pool is added to the hns3 driver, it is always
enabled unconditionally, which means spilt page handling
in the hns3 driver is dead code.

As there is a requirement to test the performance between
spilt page handling in driver and page pool, so add a module
param to support disabling the page pool.

When the page pool is proved to perform better in most case,
the spilt page handling in driver can be removed.

Fixes: 93188e96 ("net: hns3: support skb's frag page recycling based on page pool")
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarYongxin Li <liyongxin1@huawei.com>
Signed-off-by: default avatarJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 47ffdc55

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

+5 −1
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ static unsigned int tx_sgl = 1; 
module_param(tx_sgl, uint, 0600);

MODULE_PARM_DESC(tx_sgl, "Minimum number of frags when using dma_map_sg() to optimize the IOMMU mapping");



static bool page_pool_enabled = true;

module_param(page_pool_enabled, bool, 0400);



#define HNS3_SGL_SIZE(nfrag)	(sizeof(struct scatterlist) * (nfrag) +	\

				 sizeof(struct sg_table))

#define HNS3_MAX_SGL_SIZE	ALIGN(HNS3_SGL_SIZE(HNS3_MAX_TSO_BD_NUM), \
@@ -4757,6 +4760,7 @@ static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring) 
		goto out_with_desc_cb;



	if (!HNAE3_IS_TX_RING(ring)) {

		if (page_pool_enabled)

			hns3_alloc_page_pool(ring);



		ret = hns3_alloc_ring_buffers(ring);