Skip to contentSkip to conversation

GVE page allocation improvement

PATCH New David Awogbemila 2 participants 3 messages Jan 25, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover GVE page allocation improvement

This series contains one patch which attempts to improve the way gve allocates pages by specifying GFP_ATOMIC in the hot path instead of GFP_KERNEL.

Catherine Sullivan (1):
gve: Fix GFP flags when allocing pages

 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(-)
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
#1 lore raw

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
index 5f5d4f7aa813..160735484465 100644
@@ -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
index f7f65c4bf993..54e51c8221b8 100644
@@ -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
index 9ddcc497f48e..2068199445bd 100644
@@ -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
index beb8bb079023..8c939628e2d8 100644
@@ -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
maintainer
#2 lore raw

Re: [PATCH net-next] gve: Fix GFP flags when allocing pages

Quoted 8 lines · On Tue, 25 Jan 2022 13:59:10 -0800 David Awogbemila wrote:

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.

Sounds like a fix, right? Sleeping in atomic is a bug. In that case please resend as [PATCH net] and with a Fixes: tag included.

FWIW adding cover letters with a single patch is not required, but you can keep it if you prefer it that way.