net: ena: use xdp_return_frame() to free xdp frames

XDP subsystem has a function to free XDP frames and their associated
pages. Using this function would help the driver's XDP implementation to
adjust to new changes in the XDP subsystem in the kernel (e.g.
introduction of XDP MB).

Also, remove 'xdp_rx_page' field from ena_tx_buffer struct since it is
no longer used.

Signed-off-by: Shay Agroskin <shayagr@amazon.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index d47814b16834eec58b45ab9571d6d996fcd2391c..a4dc794e73896b7fd267cb55024c0b3fe29cd408 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -299,7 +299,6 @@ static int ena_xdp_xmit_frame(struct net_device *dev,
        req_id = xdp_ring->free_ids[next_to_use];
        tx_info = &xdp_ring->tx_buffer_info[req_id];
        tx_info->num_of_bufs = 0;
-       tx_info->xdp_rx_page = virt_to_page(xdpf->data);
 
        rc = ena_xdp_tx_map_frame(xdp_ring, tx_info, xdpf, &push_hdr, &push_len);
        if (unlikely(rc))
@@ -1836,7 +1835,7 @@ static int ena_clean_xdp_irq(struct ena_ring *xdp_ring, u32 budget)
                tx_pkts++;
                total_done += tx_info->tx_descs;
 
-               __free_page(tx_info->xdp_rx_page);
+               xdp_return_frame(xdpf);
                xdp_ring->free_ids[next_to_clean] = req_id;
                next_to_clean = ENA_TX_RING_IDX_NEXT(next_to_clean,
                                                     xdp_ring->ring_size);

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 0fef876c23eb3136c5203840c820b4522c1aee23..fed79c50a870580c01a37a72ecc5a7b80212b009 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -170,12 +170,6 @@ struct ena_tx_buffer {
         * the xdp queues
         */
        struct xdp_frame *xdpf;
-       /* The rx page for the rx buffer that was received in rx and
-        * re transmitted on xdp tx queues as a result of XDP_TX action.
-        * We need to free the page once we finished cleaning the buffer in
-        * clean_xdp_irq()
-        */
-       struct page *xdp_rx_page;
 
        /* Indicate if bufs[0] map the linear data of the skb. */
        u8 map_linear_data;