ixgbe/fm10k: Only support macvlan offload for types that support destination filtering

Both the ixgbe and fm10k drivers support destination filtering.

Instead of adding a ton of complexity to support either source or passthru
mode we can instead just avoid offloading them for now. Doing this we avoid
leaking packets into interfaces that aren't meant to receive them.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index ee645bacfe93f4f8dc000d4398271a56216ebc7f..26e7497663378e7a7f2e5517d3ae183a01b0dd33 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -22,6 +22,7 @@
 #include "fm10k.h"
 #include <linux/vmalloc.h>
 #include <net/udp_tunnel.h>
+#include <linux/if_macvlan.h>
 
 /**
  * fm10k_setup_tx_resources - allocate Tx resources (Descriptors)
@@ -1449,6 +1450,13 @@ static void *fm10k_dfwd_add_station(struct net_device *dev,
        int size = 0, i;
        u16 glort;
 
+       /* The hardware supported by fm10k only filters on the destination MAC
+        * address. In order to avoid issues we only support offloading modes
+        * where the hardware can actually provide the functionality.
+        */
+       if (!macvlan_supports_dest_filter(sdev))
+               return ERR_PTR(-EMEDIUMTYPE);
+
        /* allocate l2 accel structure if it is not available */
        if (!l2_accel) {
                /* verify there is enough free GLORTs to support l2_accel */

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 2c648214148e6c48841d54103ff65ad6a6f69f55..76f54771fdb2e1be57f305230c267389f94d2c2b 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9760,6 +9760,13 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev)
        unsigned int limit;
        int pool, err;
 
+       /* The hardware supported by ixgbe only filters on the destination MAC
+        * address. In order to avoid issues we only support offloading modes
+        * where the hardware can actually provide the functionality.
+        */
+       if (!macvlan_supports_dest_filter(vdev))
+               return ERR_PTR(-EMEDIUMTYPE);
+
        /* Hardware has a limited number of available pools. Each VF, and the
         * PF require a pool. Check to ensure we don't attempt to use more
         * then the available number of pools.