KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: ethernet: use own page_frag_cache

Browse source 
Using the NAPI or netdev frag cache along with other drivers can lead to
32 KiB pages being held for a long time, despite only being used for
very few page fragment.
This can happen if the ethernet driver grabs one or two fragments for rx
ring refill, while other drivers use (and free up) the remaining
fragments. The 32 KiB higher-order page can only be freed once all users
have freed their fragments, which only happens after the rings of all
drivers holding the fragments have wrapped around.

Depending on the traffic patterns, this can waste a lot of memory and
look a lot like a memory leak

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2018-07-12 17:19:07 +02:00
parent 01df4a2565
commit 0c285bd081
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
View file

@ -219,8 +219,9 @@ static inline void fe_set_txd(struct fe_tx_dma *txd, struct fe_tx_dma *dma_txd)
static void fe_clean_rx(struct fe_priv *priv) static void fe_clean_rx(struct fe_priv *priv)
{ {
int i;
struct fe_rx_ring *ring = &priv->rx_ring; struct fe_rx_ring *ring = &priv->rx_ring;
struct page *page;
int i;
if (ring->rx_data) { if (ring->rx_data) {
for (i = 0; i < ring->rx_ring_size; i++) for (i = 0; i < ring->rx_ring_size; i++)
@ -244,6 +245,13 @@ static void fe_clean_rx(struct fe_priv *priv)
ring->rx_phys); ring->rx_phys);
ring->rx_dma = NULL; ring->rx_dma = NULL;
} }
if (!ring->frag_cache.va)
return;
page = virt_to_page(ring->frag_cache.va);
__page_frag_cache_drain(page, ring->frag_cache.pagecnt_bias);
memset(&ring->frag_cache, 0, sizeof(ring->frag_cache));
} }
static int fe_alloc_rx(struct fe_priv *priv) static int fe_alloc_rx(struct fe_priv *priv)
@ -258,7 +266,9 @@ static int fe_alloc_rx(struct fe_priv *priv)
goto no_rx_mem; goto no_rx_mem;
for (i = 0; i < ring->rx_ring_size; i++) { for (i = 0; i < ring->rx_ring_size; i++) {
ring->rx_data[i] = netdev_alloc_frag(ring->frag_size); ring->rx_data[i] = page_frag_alloc(&ring->frag_cache,
ring->frag_size,
GFP_KERNEL);
if (!ring->rx_data[i]) if (!ring->rx_data[i])
goto no_rx_mem; goto no_rx_mem;
} }
@ -881,7 +891,8 @@ static int fe_poll_rx(struct napi_struct *napi, int budget,
break; break;
/* alloc new buffer */ /* alloc new buffer */
new_data = netdev_alloc_frag(ring->frag_size); new_data = page_frag_alloc(&ring->frag_cache, ring->frag_size,
GFP_ATOMIC);
if (unlikely(!new_data)) { if (unlikely(!new_data)) {
stats->rx_dropped++; stats->rx_dropped++;
goto release_desc; goto release_desc;

1
target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.h
View file

@ -454,6 +454,7 @@ struct fe_tx_ring {
}; };
struct fe_rx_ring { struct fe_rx_ring {
struct page_frag_cache frag_cache;
struct fe_rx_dma *rx_dma; struct fe_rx_dma *rx_dma;
u8 **rx_data; u8 **rx_data;
dma_addr_t rx_phys; dma_addr_t rx_phys;