github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

gve: Refactor napi add and remove functions

Browse Source 
This change makes the napi poll functions non-static and moves the
gve_(add|remove)_napi functions to gve_utils.c, to make possible future
"start queue" hooks in the datapath files.

Signed-off-by: Shailend Chand <shailend@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Jeroen de Borst <jeroendb@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240122182632.1102721-3-shailend@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Shailend Chand 2024-01-22 18:26:28 +00:00 committed by Jakub Kicinski
parent 7cea48b9a4
commit 1dfc2e4611
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/google/gve/gve.h
View File

@ -1085,6 +1085,9 @@ static inline u32 gve_xdp_tx_start_queue_id(struct gve_priv *priv)
return gve_xdp_tx_queue_id(priv, 0); return gve_xdp_tx_queue_id(priv, 0);
} }
/* gqi napi handler defined in gve_main.c */
int gve_napi_poll(struct napi_struct *napi, int budget);
/* buffers */ /* buffers */
int gve_alloc_page(struct gve_priv *priv, struct device *dev, int gve_alloc_page(struct gve_priv *priv, struct device *dev,
struct page **page, dma_addr_t *dma, struct page **page, dma_addr_t *dma,

2
drivers/net/ethernet/google/gve/gve_dqo.h
View File

@ -93,4 +93,6 @@ gve_set_itr_coalesce_usecs_dqo(struct gve_priv *priv,
gve_write_irq_doorbell_dqo(priv, block, gve_write_irq_doorbell_dqo(priv, block,
gve_setup_itr_interval_dqo(usecs)); gve_setup_itr_interval_dqo(usecs));
} }
int gve_napi_poll_dqo(struct napi_struct *napi, int budget);
#endif /* _GVE_DQO_H_ */ #endif /* _GVE_DQO_H_ */

20
drivers/net/ethernet/google/gve/gve_main.c
View File

@ -22,6 +22,7 @@
#include "gve_dqo.h" #include "gve_dqo.h"
#include "gve_adminq.h" #include "gve_adminq.h"
#include "gve_register.h" #include "gve_register.h"
#include "gve_utils.h"
#define GVE_DEFAULT_RX_COPYBREAK (256) #define GVE_DEFAULT_RX_COPYBREAK (256)
@ -252,7 +253,7 @@ static irqreturn_t gve_intr_dqo(int irq, void *arg)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int gve_napi_poll(struct napi_struct *napi, int budget) int gve_napi_poll(struct napi_struct *napi, int budget)
{ {
struct gve_notify_block *block; struct gve_notify_block *block;
__be32 __iomem *irq_doorbell; __be32 __iomem *irq_doorbell;
@ -302,7 +303,7 @@ static int gve_napi_poll(struct napi_struct *napi, int budget)
return work_done; return work_done;
} }
static int gve_napi_poll_dqo(struct napi_struct *napi, int budget) int gve_napi_poll_dqo(struct napi_struct *napi, int budget)
{ {
struct gve_notify_block *block = struct gve_notify_block *block =
container_of(napi, struct gve_notify_block, napi); container_of(napi, struct gve_notify_block, napi);
@ -581,21 +582,6 @@ static void gve_teardown_device_resources(struct gve_priv *priv)
gve_clear_device_resources_ok(priv); gve_clear_device_resources_ok(priv);
} }
static void gve_add_napi(struct gve_priv *priv, int ntfy_idx,
int (*gve_poll)(struct napi_struct *, int))
{
struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
netif_napi_add(priv->dev, &block->napi, gve_poll);
}
static void gve_remove_napi(struct gve_priv *priv, int ntfy_idx)
{
struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
netif_napi_del(&block->napi);
}
static int gve_register_xdp_qpls(struct gve_priv *priv) static int gve_register_xdp_qpls(struct gve_priv *priv)
{ {
int start_id; int start_id;

15
drivers/net/ethernet/google/gve/gve_utils.c
View File

@ -81,3 +81,18 @@ void gve_dec_pagecnt_bias(struct gve_rx_slot_page_info *page_info)
page_ref_add(page_info->page, INT_MAX - pagecount); page_ref_add(page_info->page, INT_MAX - pagecount);
} }
} }
void gve_add_napi(struct gve_priv *priv, int ntfy_idx,
int (*gve_poll)(struct napi_struct *, int))
{
struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
netif_napi_add(priv->dev, &block->napi, gve_poll);
}
void gve_remove_napi(struct gve_priv *priv, int ntfy_idx)
{
struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
netif_napi_del(&block->napi);
}

3
drivers/net/ethernet/google/gve/gve_utils.h
View File

@ -23,5 +23,8 @@ struct sk_buff *gve_rx_copy(struct net_device *dev, struct napi_struct *napi,
/* Decrement pagecnt_bias. Set it back to INT_MAX if it reached zero. */ /* Decrement pagecnt_bias. Set it back to INT_MAX if it reached zero. */
void gve_dec_pagecnt_bias(struct gve_rx_slot_page_info *page_info); void gve_dec_pagecnt_bias(struct gve_rx_slot_page_info *page_info);
void gve_add_napi(struct gve_priv *priv, int ntfy_idx,
int (*gve_poll)(struct napi_struct *, int));
void gve_remove_napi(struct gve_priv *priv, int ntfy_idx);
#endif /* _GVE_UTILS_H */ #endif /* _GVE_UTILS_H */