When pre-filling DQO and GQI RX rings in process context before NAPI is enabled (e.g. gve_open), use GFP_KERNEL instead of GFP_ATOMIC so page allocation (and CoCo page decryption) can sleep instead of dipping into atomic reserves. Signed-off-by: Luigi Rizzo --- drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c | 8 +++++++- drivers/net/ethernet/google/gve/gve_rx.c | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c b/drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c index 6880d1531ba5e..a3fe684ca087a 100644 --- a/drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c @@ -223,13 +223,19 @@ void gve_free_to_page_pool(struct gve_rx_ring *rx, static int gve_alloc_from_page_pool(struct gve_rx_ring *rx, struct gve_rx_buf_state_dqo *buf_state) { + /* + * Use GFP_KERNEL when pre-filling RX rings in process context (e.g. + * gve_open) so PISA metadata init and CoCo page decryption can sleep. + */ + gfp_t gfp = (gve_get_napi_enabled(rx->gve) || in_softirq()) ? + GFP_ATOMIC : GFP_KERNEL; netmem_ref netmem; buf_state->page_info.buf_size = rx->packet_buffer_truesize; netmem = page_pool_alloc_netmem(rx->dqo.page_pool, &buf_state->page_info.page_offset, &buf_state->page_info.buf_size, - GFP_ATOMIC); + gfp); if (!netmem) return -ENOMEM; diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c index 81ea800e66e94..7c201fd513ee3 100644 --- a/drivers/net/ethernet/google/gve/gve_rx.c +++ b/drivers/net/ethernet/google/gve/gve_rx.c @@ -159,14 +159,13 @@ static void gve_setup_rx_buffer(struct gve_rx_ring *rx, static int gve_rx_alloc_buffer(struct gve_priv *priv, struct device *dev, struct gve_rx_slot_page_info *page_info, union gve_rx_data_slot *data_slot, - struct gve_rx_ring *rx) + struct gve_rx_ring *rx, gfp_t gfp) { struct page *page; dma_addr_t dma; int err; - err = gve_alloc_page(priv, dev, &page, &dma, DMA_FROM_DEVICE, - GFP_ATOMIC); + err = gve_alloc_page(priv, dev, &page, &dma, DMA_FROM_DEVICE, gfp); if (err) { u64_stats_update_begin(&rx->statss); rx->rx_buf_alloc_fail++; @@ -209,7 +208,7 @@ static int gve_rx_prefill_pages(struct gve_rx_ring *rx, } err = gve_rx_alloc_buffer(priv, &priv->pdev->dev, &rx->data.page_info[i], - &rx->data.data_ring[i], rx); + &rx->data.data_ring[i], rx, GFP_KERNEL); if (err) goto alloc_err_rda; } @@ -986,7 +985,8 @@ static bool gve_rx_refill_buffers(struct gve_priv *priv, struct gve_rx_ring *rx) gve_rx_free_buffer(dev, page_info, data_slot); page_info->page = NULL; if (gve_rx_alloc_buffer(priv, dev, page_info, - data_slot, rx)) { + data_slot, rx, + GFP_ATOMIC)) { break; } } -- 2.56.1.809.ga0b61035b5-goog