idpf: add support for .ndo_xdp_xmit()

Use libeth XDP infra to implement .ndo_xdp_xmit() in idpf.
The Tx callbacks are reused from XDP_TX code. XDP redirect target
feature is set/cleared depending on the XDP prog presence, as for now
we still don't allocate XDP Tx queues when there's no program.

Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Tested-by: Ramu R <ramu.r@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c
index 3bc719c9106f2e70e0814f701340189d255bafbe..0559f1da88a9849a9dbf02ec704b14f34e661bd5 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_lib.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c
@@ -2617,4 +2617,5 @@ static const struct net_device_ops idpf_netdev_ops = {
        .ndo_hwtstamp_get = idpf_hwtstamp_get,
        .ndo_hwtstamp_set = idpf_hwtstamp_set,
        .ndo_bpf = idpf_xdp,
+       .ndo_xdp_xmit = idpf_xdp_xmit,
 };

diff --git a/drivers/net/ethernet/intel/idpf/xdp.c b/drivers/net/ethernet/intel/idpf/xdp.c
index e6b45df95cd39da781e579726366f9ec333a441a..b6a8304d61f97ffcc092e5f1cce27a1ad1eb049c 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/xdp.c
+++ b/drivers/net/ethernet/intel/idpf/xdp.c
@@ -322,8 +322,26 @@ LIBETH_XDP_DEFINE_START();
 LIBETH_XDP_DEFINE_TIMER(static idpf_xdp_tx_timer, idpf_xdpsq_complete);
 LIBETH_XDP_DEFINE_FLUSH_TX(idpf_xdp_tx_flush_bulk, idpf_xdp_tx_prep,
                           idpf_xdp_tx_xmit);
+LIBETH_XDP_DEFINE_FLUSH_XMIT(static idpf_xdp_xmit_flush_bulk, idpf_xdp_tx_prep,
+                            idpf_xdp_tx_xmit);
 LIBETH_XDP_DEFINE_END();
 
+int idpf_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
+                 u32 flags)
+{
+       const struct idpf_netdev_priv *np = netdev_priv(dev);
+       const struct idpf_vport *vport = np->vport;
+
+       if (unlikely(!netif_carrier_ok(dev) || !vport->link_up))
+               return -ENETDOWN;
+
+       return libeth_xdp_xmit_do_bulk(dev, n, frames, flags,
+                                      &vport->txqs[vport->xdp_txq_offset],
+                                      vport->num_xdp_txq,
+                                      idpf_xdp_xmit_flush_bulk,
+                                      idpf_xdp_tx_finalize);
+}
+
 void idpf_xdp_set_features(const struct idpf_vport *vport)
 {
        if (!idpf_is_queue_model_split(vport->rxq_model))
@@ -378,6 +396,8 @@ static int idpf_xdp_setup_prog(struct idpf_vport *vport,
        if (old)
                bpf_prog_put(old);
 
+       libeth_xdp_set_redirect(vport->netdev, vport->xdp_prog);
+
        return ret;
 }
 

diff --git a/drivers/net/ethernet/intel/idpf/xdp.h b/drivers/net/ethernet/intel/idpf/xdp.h
index 986156162e2d9215c8067f5d7b3becd1bb142b15..db8ecc1843fe19fcf97502162c0fea1bac319b31 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/xdp.h
+++ b/drivers/net/ethernet/intel/idpf/xdp.h
@@ -102,5 +102,7 @@ static inline void idpf_xdp_tx_finalize(void *_xdpsq, bool sent, bool flush)
 void idpf_xdp_set_features(const struct idpf_vport *vport);
 
 int idpf_xdp(struct net_device *dev, struct netdev_bpf *xdp);
+int idpf_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
+                 u32 flags);
 
 #endif /* _IDPF_XDP_H_ */