| Message ID | 20240930210731.1629-3-jdamato@fastly.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 021f9e671e4a7166e7a267531553b9e0b7d19681 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | gve: Link IRQs, queues, and NAPI instances | expand |
On Mon, Sep 30, 2024 at 2:08 PM Joe Damato <jdamato@fastly.com> wrote: > > Use the netdev-genl interface to map NAPI instances to queues so that > this information is accessible to user programs via netlink. > > $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ > --dump queue-get --json='{"ifindex": 2}' > > [{'id': 0, 'ifindex': 2, 'napi-id': 8313, 'type': 'rx'}, > {'id': 1, 'ifindex': 2, 'napi-id': 8314, 'type': 'rx'}, > {'id': 2, 'ifindex': 2, 'napi-id': 8315, 'type': 'rx'}, > {'id': 3, 'ifindex': 2, 'napi-id': 8316, 'type': 'rx'}, > {'id': 4, 'ifindex': 2, 'napi-id': 8317, 'type': 'rx'}, > [...] > {'id': 0, 'ifindex': 2, 'napi-id': 8297, 'type': 'tx'}, > {'id': 1, 'ifindex': 2, 'napi-id': 8298, 'type': 'tx'}, > {'id': 2, 'ifindex': 2, 'napi-id': 8299, 'type': 'tx'}, > {'id': 3, 'ifindex': 2, 'napi-id': 8300, 'type': 'tx'}, > {'id': 4, 'ifindex': 2, 'napi-id': 8301, 'type': 'tx'}, > [...] > > Signed-off-by: Joe Damato <jdamato@fastly.com> Reviewed-by: Praveen Kaligineedi <pkaligineedi@google.com>
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 661566db68c8..294ddcd0bf6c 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1875,6 +1875,11 @@ static void gve_turndown(struct gve_priv *priv) if (!gve_tx_was_added_to_block(priv, idx)) continue; + + if (idx < priv->tx_cfg.num_queues) + netif_queue_set_napi(priv->dev, idx, + NETDEV_QUEUE_TYPE_TX, NULL); + napi_disable(&block->napi); } for (idx = 0; idx < priv->rx_cfg.num_queues; idx++) { @@ -1883,6 +1888,9 @@ static void gve_turndown(struct gve_priv *priv) if (!gve_rx_was_added_to_block(priv, idx)) continue; + + netif_queue_set_napi(priv->dev, idx, NETDEV_QUEUE_TYPE_RX, + NULL); napi_disable(&block->napi); } @@ -1909,6 +1917,12 @@ static void gve_turnup(struct gve_priv *priv) continue; napi_enable(&block->napi); + + if (idx < priv->tx_cfg.num_queues) + netif_queue_set_napi(priv->dev, idx, + NETDEV_QUEUE_TYPE_TX, + &block->napi); + if (gve_is_gqi(priv)) { iowrite32be(0, gve_irq_doorbell(priv, block)); } else { @@ -1931,6 +1945,9 @@ static void gve_turnup(struct gve_priv *priv) continue; napi_enable(&block->napi); + netif_queue_set_napi(priv->dev, idx, NETDEV_QUEUE_TYPE_RX, + &block->napi); + if (gve_is_gqi(priv)) { iowrite32be(0, gve_irq_doorbell(priv, block)); } else {
Use the netdev-genl interface to map NAPI instances to queues so that this information is accessible to user programs via netlink. $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ --dump queue-get --json='{"ifindex": 2}' [{'id': 0, 'ifindex': 2, 'napi-id': 8313, 'type': 'rx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8314, 'type': 'rx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8315, 'type': 'rx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8316, 'type': 'rx'}, {'id': 4, 'ifindex': 2, 'napi-id': 8317, 'type': 'rx'}, [...] {'id': 0, 'ifindex': 2, 'napi-id': 8297, 'type': 'tx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8298, 'type': 'tx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8299, 'type': 'tx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8300, 'type': 'tx'}, {'id': 4, 'ifindex': 2, 'napi-id': 8301, 'type': 'tx'}, [...] Signed-off-by: Joe Damato <jdamato@fastly.com> --- v2: - Check that idx < priv->tx_cfg.num_queues in both gve_turnup and gve_turndown as suggested by Praveen Kaligineedi drivers/net/ethernet/google/gve/gve_main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)