ixgbe: use xdp_return_frame API

Extend struct ixgbe_tx_buffer to store the xdp_mem_info.

Notice that this could be optimized further by putting this into
a union in the struct ixgbe_tx_buffer, but this patchset
works towards removing this again.  Thus, this is not done.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 4f08c712e58e1e4e03213791c0e246e505c87a2f..abb5248e917e2f5dd16026fa25b9323308dceb1a 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -250,6 +250,7 @@ struct ixgbe_tx_buffer {
        DEFINE_DMA_UNMAP_ADDR(dma);
        DEFINE_DMA_UNMAP_LEN(len);
        u32 tx_flags;
+       struct xdp_mem_info xdp_mem;
 };
 
 struct ixgbe_rx_buffer {

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index afadba99f7b8286e287a2a88703026319f78924b..0bfe6cf2bf8be24337ee9c08aab61223b663d404 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1216,7 +1216,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
 
                /* free the skb */
                if (ring_is_xdp(tx_ring))
-                       page_frag_free(tx_buffer->data);
+                       xdp_return_frame(tx_buffer->data, &tx_buffer->xdp_mem);
                else
                        napi_consume_skb(tx_buffer->skb, napi_budget);
 
@@ -5797,7 +5797,7 @@ static void ixgbe_clean_tx_ring(struct ixgbe_ring *tx_ring)
 
                /* Free all the Tx ring sk_buffs */
                if (ring_is_xdp(tx_ring))
-                       page_frag_free(tx_buffer->data);
+                       xdp_return_frame(tx_buffer->data, &tx_buffer->xdp_mem);
                else
                        dev_kfree_skb_any(tx_buffer->skb);
 
@@ -8366,6 +8366,8 @@ static int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,
        dma_unmap_len_set(tx_buffer, len, len);
        dma_unmap_addr_set(tx_buffer, dma, dma);
        tx_buffer->data = xdp->data;
+       tx_buffer->xdp_mem = xdp->rxq->mem;
+
        tx_desc->read.buffer_addr = cpu_to_le64(dma);
 
        /* put descriptor type bits */