Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3335915d authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

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: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 53cd4d8e

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+8 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+7 −0
Original line number Diff line number Diff line
@@ -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.