Commit b1b5cff6 authored by Gerhard Engleder's avatar Gerhard Engleder Committed by Jakub Kicinski
Browse files

tsnep: Link queues to NAPIs 



Use netif_queue_set_napi() to link queues to NAPI instances so that they
can be queried with netlink.

$ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \
                         --dump queue-get --json='{"ifindex": 11}'
[{'id': 0, 'ifindex': 11, 'napi-id': 9, 'type': 'rx'},
 {'id': 1, 'ifindex': 11, 'napi-id': 10, 'type': 'rx'},
 {'id': 0, 'ifindex': 11, 'napi-id': 9, 'type': 'tx'},
 {'id': 1, 'ifindex': 11, 'napi-id': 10, 'type': 'tx'}]

Additionally use netif_napi_set_irq() to also provide NAPI interrupt
number to userspace.

$ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \
                         --do napi-get --json='{"id": 9}'
{'defer-hard-irqs': 0,
 'gro-flush-timeout': 0,
 'id': 9,
 'ifindex': 11,
 'irq': 42,
 'irq-suspend-timeout': 0}

Providing information about queues to userspace makes sense as APIs like
XSK provide queue specific access. Also XSK busy polling relies on
queues linked to NAPIs.

Signed-off-by: default avatarGerhard Engleder <gerhard@engleder-embedded.com>
Reviewed-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Link: https://patch.msgid.link/20250110223939.37490-1-gerhard@engleder-embedded.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent af2bcb57

drivers/net/ethernet/engleder/tsnep_main.c

+23 −5
Original line number Diff line number Diff line
@@ -1966,23 +1966,41 @@ static int tsnep_queue_open(struct tsnep_adapter *adapter, 


static void tsnep_queue_enable(struct tsnep_queue *queue)

{

	struct tsnep_adapter *adapter = queue->adapter;



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

	napi_enable(&queue->napi);

	tsnep_enable_irq(queue->adapter, queue->irq_mask);

	tsnep_enable_irq(adapter, queue->irq_mask);



	if (queue->tx)

	if (queue->tx) {

		netif_queue_set_napi(adapter->netdev, queue->tx->queue_index,

				     NETDEV_QUEUE_TYPE_TX, &queue->napi);

		tsnep_tx_enable(queue->tx);

	}



	if (queue->rx)

	if (queue->rx) {

		netif_queue_set_napi(adapter->netdev, queue->rx->queue_index,

				     NETDEV_QUEUE_TYPE_RX, &queue->napi);

		tsnep_rx_enable(queue->rx);

	}

}



static void tsnep_queue_disable(struct tsnep_queue *queue)

{

	if (queue->tx)

	struct tsnep_adapter *adapter = queue->adapter;



	if (queue->rx)

		netif_queue_set_napi(adapter->netdev, queue->rx->queue_index,

				     NETDEV_QUEUE_TYPE_RX, NULL);



	if (queue->tx) {

		tsnep_tx_disable(queue->tx, &queue->napi);

		netif_queue_set_napi(adapter->netdev, queue->tx->queue_index,

				     NETDEV_QUEUE_TYPE_TX, NULL);

	}



	napi_disable(&queue->napi);

	tsnep_disable_irq(queue->adapter, queue->irq_mask);

	tsnep_disable_irq(adapter, queue->irq_mask);



	/* disable RX after NAPI polling has been disabled, because RX can be

	 * enabled during NAPI polling