ice: Use ice_max_xdp_frame_size() in ice_xdp_setup_prog()

This should have been used in there from day 1, let us address that
before introducing XDP multi-buffer support for Rx side.

Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Alexander Lobakin <alexandr.lobakin@intel.com>
Link: https://lore.kernel.org/bpf/20230131204506.219292-8-maciej.fijalkowski@intel.com

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index f7b1acee2b712ff673a8d495d6bda8cdeae28079..47b35084888abd5ffd8e66c4b4545442291c7f3a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2862,6 +2862,18 @@ int ice_vsi_determine_xdp_res(struct ice_vsi *vsi)
        return 0;
 }
 
+/**
+ * ice_max_xdp_frame_size - returns the maximum allowed frame size for XDP
+ * @vsi: Pointer to VSI structure
+ */
+static int ice_max_xdp_frame_size(struct ice_vsi *vsi)
+{
+       if (test_bit(ICE_FLAG_LEGACY_RX, vsi->back->flags))
+               return ICE_RXBUF_1664;
+       else
+               return ICE_RXBUF_3072;
+}
+
 /**
  * ice_xdp_setup_prog - Add or remove XDP eBPF program
  * @vsi: VSI to setup XDP for
@@ -2872,11 +2884,11 @@ static int
 ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
                   struct netlink_ext_ack *extack)
 {
-       int frame_size = vsi->netdev->mtu + ICE_ETH_PKT_HDR_PAD;
+       unsigned int frame_size = vsi->netdev->mtu + ICE_ETH_PKT_HDR_PAD;
        bool if_running = netif_running(vsi->netdev);
        int ret = 0, xdp_ring_err = 0;
 
-       if (frame_size > vsi->rx_buf_len) {
+       if (frame_size > ice_max_xdp_frame_size(vsi)) {
                NL_SET_ERR_MSG_MOD(extack, "MTU too large for loading XDP");
                return -EOPNOTSUPP;
        }
@@ -7330,18 +7342,6 @@ clear_recovery:
        dev_err(dev, "Rebuild failed, unload and reload driver\n");
 }
 
-/**
- * ice_max_xdp_frame_size - returns the maximum allowed frame size for XDP
- * @vsi: Pointer to VSI structure
- */
-static int ice_max_xdp_frame_size(struct ice_vsi *vsi)
-{
-       if (test_bit(ICE_FLAG_LEGACY_RX, vsi->back->flags))
-               return ICE_RXBUF_1664;
-       else
-               return ICE_RXBUF_3072;
-}
-
 /**
  * ice_change_mtu - NDO callback to change the MTU
  * @netdev: network interface device structure