ice: Add support for AF_XDP (2d4238f5) · Commits · 戴 / test

drivers/net/ethernet/intel/ice/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,3 +21,4 @@ ice-y := ice_main.o \
		ice_ethtool.o
		ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o
		ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_lib.o
		ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o

drivers/net/ethernet/intel/ice/ice.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <linux/bpf.h>
		#include <linux/avf/virtchnl.h>
		#include <net/ipv6.h>
		#include <net/xdp_sock.h>
		#include "ice_devids.h"
		#include "ice_type.h"
		#include "ice_txrx.h"
		@@ -44,6 +45,7 @@
		#include "ice_sched.h"
		#include "ice_virtchnl_pf.h"
		#include "ice_sriov.h"
		#include "ice_xsk.h"

		extern const char ice_drv_ver[];
		#define ICE_BAR0 0
		@@ -287,6 +289,9 @@ struct ice_vsi {
		struct ice_ring *xdp_rings; / XDP ring array */
		u16 num_xdp_txq; /* Used XDP queues */
		u8 xdp_mapping_mode; /* ICE_MAP_MODE_[CONTIG\|SCATTER] */
		struct xdp_umem **xsk_umems;
		u16 num_xsk_umems_used;
		u16 num_xsk_umems;
		} ____cacheline_internodealigned_in_smp;

		/* struct that defines an interrupt vector */
		@@ -440,6 +445,27 @@ static inline void ice_set_ring_xdp(struct ice_ring *ring)
		ring->flags \|= ICE_TX_FLAGS_RING_XDP;
		}

		/**
		* ice_xsk_umem - get XDP UMEM bound to a ring
		* @ring - ring to use
		*
		* Returns a pointer to xdp_umem structure if there is an UMEM present,
		* NULL otherwise.
		*/
		static inline struct xdp_umem ice_xsk_umem(struct ice_ring ring)
		{
		struct xdp_umem **umems = ring->vsi->xsk_umems;
		int qid = ring->q_index;

		if (ice_ring_is_xdp(ring))
		qid -= ring->vsi->num_xdp_txq;

		if (!umems \|\| !umems[qid] \|\| !ice_is_xdp_ena_vsi(ring->vsi))
		return NULL;

		return umems[qid];
		}

		/**
		* ice_get_main_vsi - Get the PF VSI
		* @pf: PF instance

drivers/net/ethernet/intel/ice/ice_base.c

+46 −7

Original line number	Diff line number	Diff line
		@@ -276,14 +276,17 @@ ice_setup_tx_ctx(struct ice_ring ring, struct ice_tlan_ctx tlan_ctx, u16 pf_q)
		*/
		int ice_setup_rx_ctx(struct ice_ring *ring)
		{
		int chain_len = ICE_MAX_CHAINED_RX_BUFS;
		struct ice_vsi *vsi = ring->vsi;
		struct ice_hw *hw = &vsi->back->hw;
		u32 rxdid = ICE_RXDID_FLEX_NIC;
		struct ice_rlan_ctx rlan_ctx;
		struct ice_hw *hw;
		u32 regval;
		u16 pf_q;
		int err;

		hw = &vsi->back->hw;

		/* what is Rx queue number in global space of 2K Rx queues */
		pf_q = vsi->rxq_map[ring->q_index];

		@@ -297,11 +300,39 @@ int ice_setup_rx_ctx(struct ice_ring *ring)
		xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
		ring->q_index);

		ring->xsk_umem = ice_xsk_umem(ring);
		if (ring->xsk_umem) {
		xdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);

		ring->rx_buf_len = ring->xsk_umem->chunk_size_nohr -
		XDP_PACKET_HEADROOM;
		/* For AF_XDP ZC, we disallow packets to span on
		* multiple buffers, thus letting us skip that
		* handling in the fast-path.
		*/
		chain_len = 1;
		ring->zca.free = ice_zca_free;
		err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
		MEM_TYPE_PAGE_SHARED, NULL);
		MEM_TYPE_ZERO_COPY,
		&ring->zca);
		if (err)
		return err;

		dev_info(&vsi->back->pdev->dev, "Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\n",
		ring->q_index);
		} else {
		if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))
		xdp_rxq_info_reg(&ring->xdp_rxq,
		ring->netdev,
		ring->q_index);

		err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
		MEM_TYPE_PAGE_SHARED,
		NULL);
		if (err)
		return err;
		}
		}
		/* Receive Queue Base Address.
		* Indicates the starting address of the descriptor queue defined in
		* 128 Byte units.
		@@ -340,7 +371,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)
		* than 5 x DBUF
		*/
		rlan_ctx.rxmax = min_t(u16, vsi->max_frame,
		ICE_MAX_CHAINED_RX_BUFS * vsi->rx_buf_len);
		chain_len * ring->rx_buf_len);

		/* Rx queue threshold in units of 64 */
		rlan_ctx.lrxqthresh = 1;
		@@ -378,7 +409,15 @@ int ice_setup_rx_ctx(struct ice_ring *ring)
		/* init queue specific tail register */
		ring->tail = hw->hw_addr + QRX_TAIL(pf_q);
		writel(0, ring->tail);

		err = ring->xsk_umem ?
		ice_alloc_rx_bufs_slow_zc(ring, ICE_DESC_UNUSED(ring)) :
		ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));
		if (err)
		dev_info(&vsi->back->pdev->dev,
		"Failed allocate some buffers on %sRx ring %d (pf_q %d)\n",
		ring->xsk_umem ? "UMEM enabled " : "",
		ring->q_index, pf_q);

		return 0;
		}

drivers/net/ethernet/intel/ice/ice_ethtool.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2612,6 +2612,13 @@ ice_set_ringparam(struct net_device netdev, struct ethtool_ringparam ring)
		return 0;
		}

		/* If there is a AF_XDP UMEM attached to any of Rx rings,
		* disallow changing the number of descriptors -- regardless
		* if the netdev is running or not.
		*/
		if (ice_xsk_any_rx_ring_ena(vsi))
		return -EBUSY;

		while (test_and_set_bit(__ICE_CFG_BUSY, pf->state)) {
		timeout--;
		if (!timeout)

drivers/net/ethernet/intel/ice/ice_lib.c

+56 −1

Original line number	Diff line number	Diff line
		@@ -1283,7 +1283,17 @@ int ice_vsi_cfg_lan_txqs(struct ice_vsi *vsi)
		*/
		int ice_vsi_cfg_xdp_txqs(struct ice_vsi *vsi)
		{
		return ice_vsi_cfg_txqs(vsi, vsi->xdp_rings);
		int ret;
		int i;

		ret = ice_vsi_cfg_txqs(vsi, vsi->xdp_rings);
		if (ret)
		return ret;

		for (i = 0; i < vsi->num_xdp_txq; i++)
		vsi->xdp_rings[i]->xsk_umem = ice_xsk_umem(vsi->xdp_rings[i]);

		return ret;
		}

		/**
		@@ -2514,6 +2524,51 @@ char ice_nvm_version_str(struct ice_hw hw)
		return buf;
		}

		/**
		* ice_update_ring_stats - Update ring statistics
		* @ring: ring to update
		* @cont: used to increment per-vector counters
		* @pkts: number of processed packets
		* @bytes: number of processed bytes
		*
		* This function assumes that caller has acquired a u64_stats_sync lock.
		*/
		static void
		ice_update_ring_stats(struct ice_ring ring, struct ice_ring_container cont,
		u64 pkts, u64 bytes)
		{
		ring->stats.bytes += bytes;
		ring->stats.pkts += pkts;
		cont->total_bytes += bytes;
		cont->total_pkts += pkts;
		}

		/**
		* ice_update_tx_ring_stats - Update Tx ring specific counters
		* @tx_ring: ring to update
		* @pkts: number of processed packets
		* @bytes: number of processed bytes
		*/
		void ice_update_tx_ring_stats(struct ice_ring *tx_ring, u64 pkts, u64 bytes)
		{
		u64_stats_update_begin(&tx_ring->syncp);
		ice_update_ring_stats(tx_ring, &tx_ring->q_vector->tx, pkts, bytes);
		u64_stats_update_end(&tx_ring->syncp);
		}

		/**
		* ice_update_rx_ring_stats - Update Rx ring specific counters
		* @rx_ring: ring to update
		* @pkts: number of processed packets
		* @bytes: number of processed bytes
		*/
		void ice_update_rx_ring_stats(struct ice_ring *rx_ring, u64 pkts, u64 bytes)
		{
		u64_stats_update_begin(&rx_ring->syncp);
		ice_update_ring_stats(rx_ring, &rx_ring->q_vector->rx, pkts, bytes);
		u64_stats_update_end(&rx_ring->syncp);
		}

		/**
		* ice_vsi_cfg_mac_fltr - Add or remove a MAC address filter for a VSI
		* @vsi: the VSI being configured MAC filter

Admin message