ixgbe: allow to increase MTU to 3K with XDP enabled

Recently I encountered one case where I cannot increase the MTU size
directly from 1500 to a much bigger value with XDP enabled if the
server is equipped with IXGBE card, which happened on thousands of
servers in production environment. After applying the current patch,
we can set the maximum MTU size to 3K.

This patch follows the behavior of changing MTU as i40e/ice does.

References:
[1] commit 23b44513c3e6 ("ice: allow 3k MTU for XDP")
[2] commit 0c8493d90b6b ("i40e: add XDP support for pass and drop actions")

Fixes: fabf1bce103a ("ixgbe: Prevent unsupported configurations with XDP")
Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index ab8370c413f3f703853031120c05d8968359978a..25ca329f7d3c43ea2d6f84dca2e8947873268b13 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6777,6 +6777,18 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter)
                        ixgbe_free_rx_resources(adapter->rx_ring[i]);
 }
 
+/**
+ * ixgbe_max_xdp_frame_size - returns the maximum allowed frame size for XDP
+ * @adapter: device handle, pointer to adapter
+ */
+static int ixgbe_max_xdp_frame_size(struct ixgbe_adapter *adapter)
+{
+       if (PAGE_SIZE >= 8192 || adapter->flags2 & IXGBE_FLAG2_RX_LEGACY)
+               return IXGBE_RXBUFFER_2K;
+       else
+               return IXGBE_RXBUFFER_3K;
+}
+
 /**
  * ixgbe_change_mtu - Change the Maximum Transfer Unit
  * @netdev: network interface device structure
@@ -6788,18 +6800,13 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
 {
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-       if (adapter->xdp_prog) {
+       if (ixgbe_enabled_xdp_adapter(adapter)) {
                int new_frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN +
                                     VLAN_HLEN;
-               int i;
-
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       struct ixgbe_ring *ring = adapter->rx_ring[i];
 
-                       if (new_frame_size > ixgbe_rx_bufsz(ring)) {
-                               e_warn(probe, "Requested MTU size is not supported with XDP\n");
-                               return -EINVAL;
-                       }
+               if (new_frame_size > ixgbe_max_xdp_frame_size(adapter)) {
+                       e_warn(probe, "Requested MTU size is not supported with XDP\n");
+                       return -EINVAL;
                }
        }