gve: Fix GFP flags when allocing pages
Subsystems (3)
PATCH 1/1 gve: Fix GFP flags when allocing pages
From: Catherine Sullivan <[email protected]>
Use GFP_ATOMIC when allocating pages out of the hotpath, continue to use GFP_KERNEL when allocating pages during setup.
GFP_KERNEL will allow blocking which allows it to succeed more often in a low memory enviornment but in the hotpath we do not want to allow the allocation to block.
--- drivers/net/ethernet/google/gve/gve.h | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 6 +++--- drivers/net/ethernet/google/gve/gve_rx.c | 3 ++- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/google/gve/gve.h +1 -1
@@ -843,7 +843,7 @@ static inline bool gve_is_gqi(struct gve_priv *priv)/* buffers */ int gve_alloc_page (struct gve_priv *priv,struct device *dev,struct page **page,dma_addr_t *dma, -enum dma_data_direction ); +enum dma_data_direction ,gfp_t gfp_flags);void gve_free_page (struct device *dev,struct page *page,dma_addr_t dma,enum dma_data_direction );/* tx handling */
drivers/net/ethernet/google/gve/gve_main.c +3 -3
@@ -766,9 +766,9 @@ static void gve_free_rings(struct gve_priv *priv)int gve_alloc_page (struct gve_priv *priv,struct device *dev,struct page **page,dma_addr_t *dma, -enum dma_data_direction dir) +enum dma_data_direction dir,gfp_t gfp_flags) { - *page =alloc_page (GFP_KERNEL ); + *page =alloc_page (gfp_flags);if (!*page) { priv->page_alloc_fail++;return -ENOMEM ;
@@ -811,7 +811,7 @@ static int gve_alloc_queue_page_list(struct gve_priv *priv, u32 id,for (i =0 ; i < pages; i++) { err =gve_alloc_page (priv, &priv->pdev->dev, &qpl->pages[i], &qpl->page_buses[i], -gve_qpl_dma_dir (priv, id)); +gve_qpl_dma_dir (priv, id),GFP_KERNEL );/* caller handles clean up */ if (err)return -ENOMEM ;
drivers/net/ethernet/google/gve/gve_rx.c +2 -1
@@ -86,7 +86,8 @@ static int gve_rx_alloc_buffer(struct gve_priv *priv, struct device *dev,dma_addr_t dma;int err; - err =gve_alloc_page (priv, dev, &page, &dma,DMA_FROM_DEVICE ); + err =gve_alloc_page (priv, dev, &page, &dma,DMA_FROM_DEVICE , +GFP_ATOMIC );if (err)return err;
drivers/net/ethernet/google/gve/gve_rx_dqo.c +1 -1
@@ -157,7 +157,7 @@ static int gve_alloc_page_dqo(struct gve_priv *priv,int err; err =gve_alloc_page (priv, &priv->pdev->dev, &buf_state->page_info.page, - &buf_state->addr,DMA_FROM_DEVICE ); + &buf_state->addr,DMA_FROM_DEVICE ,GFP_KERNEL );if (err)return err;
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 25 Jan 2022 16:38:43 -0800 you wrote:
From: Catherine Sullivan <[email protected]>
Use
GFP_ATOMICwhen allocating pages out of the hotpath, continue to useGFP_KERNELwhen allocating pages during setup.
GFP_KERNELwill allow blocking which allows it to succeed more often in a low memory enviornment but in the hotpath we do not want to allow the allocation to block.[...]
Here is the summary with links:
- [net] gve: Fix GFP flags when allocing pages
https://git.kernel.org/netdev/net/c/a92f7a6feeb3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html