| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- From: Chen Lin <[email protected]>
- Date: Wed, 8 Jun 2022 20:46:53 +0800
- Subject: [PATCH] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface
- netdev[napi]_alloc_frag
- When rx_flag == MTK_RX_FLAGS_HWLRO,
- rx_data_len = MTK_MAX_LRO_RX_LENGTH(4096 * 3) > PAGE_SIZE.
- netdev_alloc_frag is for alloction of page fragment only.
- Reference to other drivers and Documentation/vm/page_frags.rst
- Branch to use __get_free_pages when ring->frag_size > PAGE_SIZE.
- Signed-off-by: Chen Lin <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- @@ -917,6 +917,17 @@ static bool mtk_rx_get_desc(struct mtk_e
- return true;
- }
-
- +static void *mtk_max_lro_buf_alloc(gfp_t gfp_mask)
- +{
- + unsigned int size = mtk_max_frag_size(MTK_MAX_LRO_RX_LENGTH);
- + unsigned long data;
- +
- + data = __get_free_pages(gfp_mask | __GFP_COMP | __GFP_NOWARN,
- + get_order(size));
- +
- + return (void *)data;
- +}
- +
- /* the qdma core needs scratch memory to be setup */
- static int mtk_init_fq_dma(struct mtk_eth *eth)
- {
- @@ -1485,7 +1496,10 @@ static int mtk_poll_rx(struct napi_struc
- goto release_desc;
-
- /* alloc new buffer */
- - new_data = napi_alloc_frag(ring->frag_size);
- + if (ring->frag_size <= PAGE_SIZE)
- + new_data = napi_alloc_frag(ring->frag_size);
- + else
- + new_data = mtk_max_lro_buf_alloc(GFP_ATOMIC);
- if (unlikely(!new_data)) {
- netdev->stats.rx_dropped++;
- goto release_desc;
- @@ -1938,7 +1952,10 @@ static int mtk_rx_alloc(struct mtk_eth *
- return -ENOMEM;
-
- for (i = 0; i < rx_dma_size; i++) {
- - ring->data[i] = netdev_alloc_frag(ring->frag_size);
- + if (ring->frag_size <= PAGE_SIZE)
- + ring->data[i] = netdev_alloc_frag(ring->frag_size);
- + else
- + ring->data[i] = mtk_max_lro_buf_alloc(GFP_KERNEL);
- if (!ring->data[i])
- return -ENOMEM;
- }
|