| Message ID | 20240811184949.2799-1-eladwf@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [net] net: ethernet: mtk_eth_soc: fix memory leak in LRO rings release | expand |
Hi Elad, kernel test robot noticed the following build errors: [auto build test ERROR on net/main] url: https://github.com/intel-lab-lkp/linux/commits/Elad-Yifee/net-ethernet-mtk_eth_soc-fix-memory-leak-in-LRO-rings-release/20240812-025108 base: net/main patch link: https://lore.kernel.org/r/20240811184949.2799-1-eladwf%40gmail.com patch subject: [PATCH net] net: ethernet: mtk_eth_soc: fix memory leak in LRO rings release config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20240812/202408120923.HUpL6sBp-lkp@intel.com/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240812/202408120923.HUpL6sBp-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408120923.HUpL6sBp-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/net/ethernet/mediatek/mtk_eth_soc.c:1768:14: error: incompatible pointer to integer conversion passing 'void *' to parameter of type 'unsigned long' [-Wint-conversion] 1768 | free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); | ^~~~ include/linux/gfp.h:372:38: note: passing argument to parameter 'addr' here 372 | extern void free_pages(unsigned long addr, unsigned int order); | ^ 1 error generated. vim +1768 drivers/net/ethernet/mediatek/mtk_eth_soc.c 1759 1760 static void mtk_rx_put_buff(struct mtk_rx_ring *ring, void *data, bool napi) 1761 { 1762 if (ring->page_pool) 1763 page_pool_put_full_page(ring->page_pool, 1764 virt_to_head_page(data), napi); 1765 else if (ring->frag_size <= PAGE_SIZE) 1766 skb_free_frag(data); 1767 else > 1768 free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); 1769 } 1770
Hi Elad, kernel test robot noticed the following build warnings: [auto build test WARNING on net/main] url: https://github.com/intel-lab-lkp/linux/commits/Elad-Yifee/net-ethernet-mtk_eth_soc-fix-memory-leak-in-LRO-rings-release/20240812-025108 base: net/main patch link: https://lore.kernel.org/r/20240811184949.2799-1-eladwf%40gmail.com patch subject: [PATCH net] net: ethernet: mtk_eth_soc: fix memory leak in LRO rings release config: i386-allmodconfig (https://download.01.org/0day-ci/archive/20240812/202408121146.9ulfLUnP-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240812/202408121146.9ulfLUnP-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408121146.9ulfLUnP-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/net/ethernet/mediatek/mtk_eth_soc.c: In function 'mtk_rx_put_buff': >> drivers/net/ethernet/mediatek/mtk_eth_soc.c:1768:28: warning: passing argument 1 of 'free_pages' makes integer from pointer without a cast [-Wint-conversion] 1768 | free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); | ^~~~ | | | void * In file included from include/linux/xarray.h:16, from include/linux/radix-tree.h:21, from include/linux/idr.h:15, from include/linux/kernfs.h:12, from include/linux/sysfs.h:16, from include/linux/kobject.h:20, from include/linux/of.h:18, from drivers/net/ethernet/mediatek/mtk_eth_soc.c:9: include/linux/gfp.h:372:38: note: expected 'long unsigned int' but argument is of type 'void *' 372 | extern void free_pages(unsigned long addr, unsigned int order); | ~~~~~~~~~~~~~~^~~~ vim +/free_pages +1768 drivers/net/ethernet/mediatek/mtk_eth_soc.c 1759 1760 static void mtk_rx_put_buff(struct mtk_rx_ring *ring, void *data, bool napi) 1761 { 1762 if (ring->page_pool) 1763 page_pool_put_full_page(ring->page_pool, 1764 virt_to_head_page(data), napi); 1765 else if (ring->frag_size <= PAGE_SIZE) 1766 skb_free_frag(data); 1767 else > 1768 free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); 1769 } 1770
Hi Elad, kernel test robot noticed the following build errors: [auto build test ERROR on net/main] url: https://github.com/intel-lab-lkp/linux/commits/Elad-Yifee/net-ethernet-mtk_eth_soc-fix-memory-leak-in-LRO-rings-release/20240812-025108 base: net/main patch link: https://lore.kernel.org/r/20240811184949.2799-1-eladwf%40gmail.com patch subject: [PATCH net] net: ethernet: mtk_eth_soc: fix memory leak in LRO rings release config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20240812/202408121439.06IztS3Y-lkp@intel.com/config) compiler: s390-linux-gcc (GCC) 14.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240812/202408121439.06IztS3Y-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408121439.06IztS3Y-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/net/ethernet/mediatek/mtk_eth_soc.c: In function 'mtk_rx_put_buff': >> drivers/net/ethernet/mediatek/mtk_eth_soc.c:1768:28: error: passing argument 1 of 'free_pages' makes integer from pointer without a cast [-Wint-conversion] 1768 | free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); | ^~~~ | | | void * In file included from include/linux/xarray.h:16, from include/linux/radix-tree.h:21, from include/linux/idr.h:15, from include/linux/kernfs.h:12, from include/linux/sysfs.h:16, from include/linux/kobject.h:20, from include/linux/of.h:18, from drivers/net/ethernet/mediatek/mtk_eth_soc.c:9: include/linux/gfp.h:372:38: note: expected 'long unsigned int' but argument is of type 'void *' 372 | extern void free_pages(unsigned long addr, unsigned int order); | ~~~~~~~~~~~~~~^~~~ vim +/free_pages +1768 drivers/net/ethernet/mediatek/mtk_eth_soc.c 1759 1760 static void mtk_rx_put_buff(struct mtk_rx_ring *ring, void *data, bool napi) 1761 { 1762 if (ring->page_pool) 1763 page_pool_put_full_page(ring->page_pool, 1764 virt_to_head_page(data), napi); 1765 else if (ring->frag_size <= PAGE_SIZE) 1766 skb_free_frag(data); 1767 else > 1768 free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); 1769 } 1770
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 16ca427cf4c3..bac6d0c48d21 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1762,8 +1762,10 @@ static void mtk_rx_put_buff(struct mtk_rx_ring *ring, void *data, bool napi) if (ring->page_pool) page_pool_put_full_page(ring->page_pool, virt_to_head_page(data), napi); - else + else if (ring->frag_size <= PAGE_SIZE) skb_free_frag(data); + else + free_pages(data, get_order(mtk_max_frag_size(ring->frag_size))); } static int mtk_xdp_frame_map(struct mtk_eth *eth, struct net_device *dev, @@ -2132,7 +2134,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, ring->buf_size, DMA_FROM_DEVICE); if (unlikely(dma_mapping_error(eth->dma_dev, dma_addr))) { - skb_free_frag(new_data); + mtk_rx_put_buff(ring, new_data, true); netdev->stats.rx_dropped++; goto release_desc; } @@ -2146,7 +2148,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, skb = build_skb(data, ring->frag_size); if (unlikely(!skb)) { netdev->stats.rx_dropped++; - skb_free_frag(data); + mtk_rx_put_buff(ring, data, true); goto skip_rx; } @@ -2691,7 +2693,7 @@ static int mtk_rx_alloc(struct mtk_eth *eth, int ring_no, int rx_flag) ring->buf_size, DMA_FROM_DEVICE); if (unlikely(dma_mapping_error(eth->dma_dev, dma_addr))) { - skb_free_frag(data); + mtk_rx_put_buff(ring, data, false); return -ENOMEM; } }
For LRO we allocate more than one page, yet 'skb_free_frag' is used to free the buffer, which only frees a single page. Fix it by using 'free_pages' instead. Fixes: 2f2c0d2919a1 ("net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag") Signed-off-by: Elad Yifee <eladwf@gmail.com> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)