page_pool: remove PP_FLAG_PAGE_FRAG

PP_FLAG_PAGE_FRAG is not really needed after pp_frag_count
handling is unified and page_pool_alloc_frag() is supported
in 32-bit arch with 64-bit DMA, so remove it.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
CC: Lorenzo Bianconi <lorenzo@kernel.org>
CC: Alexander Duyck <alexander.duyck@gmail.com>
CC: Liang Chen <liangchen.linux@gmail.com>
CC: Alexander Lobakin <aleksander.lobakin@intel.com>
Link: https://lore.kernel.org/r/20231020095952.11055-3-linyunsheng@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 09d96ee5674a0eaa800c664353756ecc45c4a87f)
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Change-Id: I5d7223d1cb9baefea5c7e86f9a4de3e972c04a4a

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index dac4f9510c1737e61b81fce7bae120f0d6dd7d88..06b3789e37d6ee4075a0eaa784c437c73834598d 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3214,8 +3214,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)) {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 677cfaa5fe08cd73f773893fefdff3bca5e97ae4..b618797a7e8de2563c5821347ecb441e4f0b7ad5 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -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)),

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
index e6df4e6a78ab76407d8021d790b3e5e6cfe20124..02d0b707aea5bd6b9dea286180914b5aaba4a51d 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -1409,7 +1409,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;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index c3961c2bbc57cd339ccea1c4ed902d11dc36f11e..8707691775fc939a94d34f4d7ff84fc95f9ce3c7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -834,7 +834,7 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params,
                struct page_pool_params pp_params = { 0 };
 
                pp_params.order     = 0;
-               pp_params.flags     = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV | PP_FLAG_PAGE_FRAG;
+               pp_params.flags     = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;
                pp_params.pool_size = pool_size;
                pp_params.nid       = node;
                pp_params.dev       = rq->pdev;

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index dbab400969202cae229b7962ac69ef42b6f776f2..8d668259408b0392d0d695aff789a9d3f0c0eb6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -566,7 +566,7 @@ int mt76_create_page_pool(struct mt76_dev *dev, struct mt76_queue *q)
 {
        struct page_pool_params pp_params = {
                .order = 0,
-               .flags = PP_FLAG_PAGE_FRAG,
+               .flags = 0,
                .nid = NUMA_NO_NODE,
                .dev = dev->dma_dev,
        };

diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h
index 887e7946a597494d714f12f9f7fb2e53e32557d1..6fc5134095ed19503bcecd3e223116cf49350566 100644 (file)
--- a/include/net/page_pool/types.h
+++ b/include/net/page_pool/types.h
@@ -17,10 +17,8 @@
                                        * Please note DMA-sync-for-CPU is still
                                        * device driver responsibility
                                        */
-#define PP_FLAG_PAGE_FRAG      BIT(2) /* for page frag feature */
 #define PP_FLAG_ALL            (PP_FLAG_DMA_MAP |\
-                                PP_FLAG_DMA_SYNC_DEV |\
-                                PP_FLAG_PAGE_FRAG)
+                                PP_FLAG_DMA_SYNC_DEV)
 
 /*
  * Fast allocation side cache array/stack
@@ -45,7 +43,7 @@ struct pp_alloc_cache {
 
 /**
  * struct page_pool_params - page pool parameters
- * @flags:     PP_FLAG_DMA_MAP, PP_FLAG_DMA_SYNC_DEV, PP_FLAG_PAGE_FRAG
+ * @flags:     PP_FLAG_DMA_MAP, PP_FLAG_DMA_SYNC_DEV
  * @order:     2^order pages on allocation
  * @pool_size: size of the ptr_ring
  * @nid:       NUMA node id to allocate from pages from

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 59bad963df265212c400725bb7c8113d8cae082a..11ce15a547f6282bf5de3c6221cfe75cd72ab33c 100644 (file)
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -760,8 +760,7 @@ struct page *page_pool_alloc_frag(struct page_pool *pool,
        unsigned int max_size = PAGE_SIZE << pool->p.order;
        struct page *page = pool->frag_page;
 
-       if (WARN_ON(!(pool->p.flags & PP_FLAG_PAGE_FRAG) ||
-                   size > max_size))
+       if (WARN_ON(size > max_size))
                return NULL;
 
        size = ALIGN(size, dma_get_cache_alignment());

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9a9fbe18bf2f9734c6ab5cc59ff091dc5321ca16..8c1dd6348f60a83bbfa4a28c5e7ca77ccf6d0307 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -5752,7 +5752,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
        /* In general, avoid mixing page_pool and non-page_pool allocated
         * pages within the same SKB. Additionally avoid dealing with clones
         * with page_pool pages, in case the SKB is using page_pool fragment
-        * references (PP_FLAG_PAGE_FRAG). Since we only take full page
+        * references (page_pool_alloc_frag()). Since we only take full page
         * references for cloned SKBs at the moment that would result in
         * inconsistent reference counts.
         * In theory we could take full references if @from is cloned and