Commit b02e5a0e authored by Björn Töpel's avatar Björn Töpel Committed by Daniel Borkmann
Browse files

xsk: Propagate napi_id to XDP socket Rx path 



Add napi_id to the xdp_rxq_info structure, and make sure the XDP
socket pick up the napi_id in the Rx path. The napi_id is used to find
the corresponding NAPI structure for socket busy polling.

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/bpf/20201130185205.196029-7-bjorn.topel@gmail.com
parent a0731952

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int ena_xdp_register_rxq_info(struct ena_ring *rx_ring) 
{

	int rc;



	rc = xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev, rx_ring->qid);

	rc = xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev, rx_ring->qid, 0);



	if (rc) {

		netif_err(rx_ring->adapter, ifup, rx_ring->netdev,

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ static int bnxt_alloc_rx_rings(struct bnxt *bp) 
		if (rc)

			return rc;



		rc = xdp_rxq_info_reg(&rxr->xdp_rxq, bp->dev, i);

		rc = xdp_rxq_info_reg(&rxr->xdp_rxq, bp->dev, i, 0);

		if (rc < 0)

			return rc;

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs, 
	rq->caching = 1;



	/* Driver have no proper error path for failed XDP RX-queue info reg */

	WARN_ON(xdp_rxq_info_reg(&rq->xdp_rxq, nic->netdev, qidx) < 0);

	WARN_ON(xdp_rxq_info_reg(&rq->xdp_rxq, nic->netdev, qidx, 0) < 0);



	/* Send a mailbox msg to PF to config RQ */

	mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG;

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+1 −1
Original line number Diff line number Diff line
@@ -3334,7 +3334,7 @@ static int dpaa2_eth_setup_rx_flow(struct dpaa2_eth_priv *priv, 
		return 0;



	err = xdp_rxq_info_reg(&fq->channel->xdp_rxq, priv->net_dev,

			       fq->flowid);

			       fq->flowid, 0);

	if (err) {

		dev_err(dev, "xdp_rxq_info_reg failed\n");

		return err;

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ int i40e_setup_rx_descriptors(struct i40e_ring *rx_ring) 
	/* XDP RX-queue info only needed for RX rings exposed to XDP */

	if (rx_ring->vsi->type == I40E_VSI_MAIN) {

		err = xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev,

				       rx_ring->queue_index);

				       rx_ring->queue_index, rx_ring->q_vector->napi.napi_id);

		if (err < 0)

			return err;

	}