Commit b7074e43 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'gve-link-irqs-queues-and-napi-instances' 

Joe Damato says:

====================
gve: Link IRQs, queues, and NAPI instances

This series uses the netdev-genl API to link IRQs and queues to NAPI IDs
so that this information is queryable by user apps. This is particularly
useful for epoll-based busy polling apps which rely on having access to
the NAPI ID.

I've tested these commits on a GCP instance with a GVE NIC configured
and have included test output in the commit messages for each patch
showing how to query the information.

[1]: https://lore.kernel.org/netdev/20240926030025.226221-1-jdamato@fastly.com/
====================

Link: https://patch.msgid.link/20240930210731.1629-1-jdamato@fastly.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d772cc25 021f9e67

drivers/net/ethernet/google/gve/gve_main.c

+17 −0
Original line number Diff line number Diff line
@@ -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 {

drivers/net/ethernet/google/gve/gve_utils.c

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ void gve_add_napi(struct gve_priv *priv, int ntfy_idx, 
	struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];



	netif_napi_add(priv->dev, &block->napi, gve_poll);

	netif_napi_set_irq(&block->napi, block->irq);

}



void gve_remove_napi(struct gve_priv *priv, int ntfy_idx)