[Intel-wired-lan] [PATCH v2 10/10] igc: Implement ndo_xdp_xmit callback

[Maciej Fijalkowski <maciej.fijalkowski@intel.com>]

On Wed, Oct 28, 2020 at 01:19:43PM -0700, Andre Guedes wrote:
> This patch introduces the helper igc_xdp_xmit() which implements the
> ndo_xdp_xmit ops, enabling the igc driver to transmit packets forwarded
> to it by xdp programs running on other interfaces.
> 
> This patch has been tested with the sample app "xdp_redirect_map"
> located in samples/bpf/.
> 
> Signed-off-by: Andre Guedes <andre.guedes@intel.com>
> ---
>  drivers/net/ethernet/intel/igc/igc_main.c | 41 +++++++++++++++++++++++
>  drivers/net/ethernet/intel/igc/igc_xdp.c  |  3 +-
>  drivers/net/ethernet/intel/igc/igc_xdp.h  |  2 ++
>  3 files changed, 44 insertions(+), 2 deletions(-)

I think that it should be squashed with previous patch? So you have
XDP_REDIRECT support in a single patch.

> 
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index f9c7bbc1347e..4d821f04e3de 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -4990,6 +4990,46 @@ static int igc_bpf(struct net_device *dev, struct netdev_bpf *bpf)
>  	}
>  }
>  
> +static int igc_xdp_xmit(struct net_device *dev, int num_frames,
> +			struct xdp_frame **frames, u32 flags)
> +{
> +	struct igc_adapter *adapter = netdev_priv(dev);
> +	int cpu = smp_processor_id();
> +	struct netdev_queue *nq;
> +	struct igc_ring *ring;
> +	int i, drops;
> +
> +	if (unlikely(test_bit(__IGC_DOWN, &adapter->state)))
> +		return -ENETDOWN;
> +
> +	if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
> +		return -EINVAL;
> +
> +	ring = igc_xdp_get_tx_ring(adapter, cpu);
> +	nq = txring_txq(ring);
> +
> +	__netif_tx_lock(nq, cpu);
> +
> +	drops = 0;
> +	for (i = 0; i < num_frames; i++) {
> +		int err;
> +		struct xdp_frame *xdpf = frames[i];
> +
> +		err = igc_xdp_init_tx_descriptor(ring, xdpf);
> +		if (err) {
> +			xdp_return_frame_rx_napi(xdpf);
> +			drops++;
> +		}
> +	}
> +
> +	if (flags & XDP_XMIT_FLUSH)
> +		igc_flush_tx_descriptors(ring);
> +
> +	__netif_tx_unlock(nq);
> +
> +	return num_frames - drops;
> +}
> +
>  static const struct net_device_ops igc_netdev_ops = {
>  	.ndo_open		= igc_open,
>  	.ndo_stop		= igc_close,
> @@ -5004,6 +5044,7 @@ static const struct net_device_ops igc_netdev_ops = {
>  	.ndo_do_ioctl		= igc_ioctl,
>  	.ndo_setup_tc		= igc_setup_tc,
>  	.ndo_bpf		= igc_bpf,
> +	.ndo_xdp_xmit		= igc_xdp_xmit,
>  };
>  
>  /* PCIe configuration access */
> diff --git a/drivers/net/ethernet/intel/igc/igc_xdp.c b/drivers/net/ethernet/intel/igc/igc_xdp.c
> index 39b8310dfba1..2fe6fac38d0b 100644
> --- a/drivers/net/ethernet/intel/igc/igc_xdp.c
> +++ b/drivers/net/ethernet/intel/igc/igc_xdp.c
> @@ -58,8 +58,7 @@ static int igc_xdp_init_tx_buffer(struct igc_tx_buffer *buffer,
>  }
>  
>  /* This function requires __netif_tx_lock is held by the caller. */
> -static int igc_xdp_init_tx_descriptor(struct igc_ring *ring,
> -				      struct xdp_frame *xdpf)
> +int igc_xdp_init_tx_descriptor(struct igc_ring *ring, struct xdp_frame *xdpf)
>  {
>  	struct igc_tx_buffer *buffer;
>  	union igc_adv_tx_desc *desc;
> diff --git a/drivers/net/ethernet/intel/igc/igc_xdp.h b/drivers/net/ethernet/intel/igc/igc_xdp.h
> index 1c38a80c3aa0..801fb27fbb85 100644
> --- a/drivers/net/ethernet/intel/igc/igc_xdp.h
> +++ b/drivers/net/ethernet/intel/igc/igc_xdp.h
> @@ -22,4 +22,6 @@ void igc_xdp_unregister_rxq_info(struct igc_ring *ring);
>  
>  struct igc_ring *igc_xdp_get_tx_ring(struct igc_adapter *adapter, int cpu);
>  
> +int igc_xdp_init_tx_descriptor(struct igc_ring *ring, struct xdp_frame *xdpf);
> +
>  #endif /* _IGC_XDP_H_ */
> -- 
> 2.28.0
> 
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan at osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan