702-v5.19-34-net-ethernet-mtk_eth_soc-fix-misuse-of-mem-alloc-int.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. From: Chen Lin <[email protected]>
  2. Date: Wed, 8 Jun 2022 20:46:53 +0800
  3. Subject: [PATCH] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface
  4. netdev[napi]_alloc_frag
  5. When rx_flag == MTK_RX_FLAGS_HWLRO,
  6. rx_data_len = MTK_MAX_LRO_RX_LENGTH(4096 * 3) > PAGE_SIZE.
  7. netdev_alloc_frag is for alloction of page fragment only.
  8. Reference to other drivers and Documentation/vm/page_frags.rst
  9. Branch to use __get_free_pages when ring->frag_size > PAGE_SIZE.
  10. Signed-off-by: Chen Lin <[email protected]>
  11. Link: https://lore.kernel.org/r/[email protected]
  12. Signed-off-by: Jakub Kicinski <[email protected]>
  13. ---
  14. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  15. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  16. @@ -917,6 +917,17 @@ static bool mtk_rx_get_desc(struct mtk_e
  17. return true;
  18. }
  19. +static void *mtk_max_lro_buf_alloc(gfp_t gfp_mask)
  20. +{
  21. + unsigned int size = mtk_max_frag_size(MTK_MAX_LRO_RX_LENGTH);
  22. + unsigned long data;
  23. +
  24. + data = __get_free_pages(gfp_mask | __GFP_COMP | __GFP_NOWARN,
  25. + get_order(size));
  26. +
  27. + return (void *)data;
  28. +}
  29. +
  30. /* the qdma core needs scratch memory to be setup */
  31. static int mtk_init_fq_dma(struct mtk_eth *eth)
  32. {
  33. @@ -1485,7 +1496,10 @@ static int mtk_poll_rx(struct napi_struc
  34. goto release_desc;
  35. /* alloc new buffer */
  36. - new_data = napi_alloc_frag(ring->frag_size);
  37. + if (ring->frag_size <= PAGE_SIZE)
  38. + new_data = napi_alloc_frag(ring->frag_size);
  39. + else
  40. + new_data = mtk_max_lro_buf_alloc(GFP_ATOMIC);
  41. if (unlikely(!new_data)) {
  42. netdev->stats.rx_dropped++;
  43. goto release_desc;
  44. @@ -1938,7 +1952,10 @@ static int mtk_rx_alloc(struct mtk_eth *
  45. return -ENOMEM;
  46. for (i = 0; i < rx_dma_size; i++) {
  47. - ring->data[i] = netdev_alloc_frag(ring->frag_size);
  48. + if (ring->frag_size <= PAGE_SIZE)
  49. + ring->data[i] = netdev_alloc_frag(ring->frag_size);
  50. + else
  51. + ring->data[i] = mtk_max_lro_buf_alloc(GFP_KERNEL);
  52. if (!ring->data[i])
  53. return -ENOMEM;
  54. }