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

Commit 361b5343 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Fix interaction between SR-IOV and macvlan offload 



When SR-IOV was enabled the macvlan offload was configuring several filters
with the wrong pool value. This would result in the macvlan interfaces not
being able to receive traffic that had to pass over the physical interface.

To fix it wrap the pool argument in the VMDQ_P macro which will add the
necessary offset to get to the actual VMDq pool

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 1b953e84

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

+5 −7
Original line number Diff line number Diff line
@@ -5428,10 +5428,11 @@ static int ixgbe_fwd_ring_up(struct net_device *vdev, 
		goto fwd_queue_err;



	if (is_valid_ether_addr(vdev->dev_addr))

		ixgbe_add_mac_filter(adapter, vdev->dev_addr, accel->pool);

		ixgbe_add_mac_filter(adapter, vdev->dev_addr,

				     VMDQ_P(accel->pool));



	ixgbe_fwd_psrtype(accel);

	ixgbe_macvlan_set_rx_mode(vdev, accel->pool, adapter);

	ixgbe_macvlan_set_rx_mode(vdev, VMDQ_P(accel->pool), adapter);

	return err;

fwd_queue_err:

	ixgbe_fwd_ring_down(vdev, accel);
@@ -9042,6 +9043,7 @@ static int get_macvlan_queue(struct net_device *upper, void *_data) 
static int handle_redirect_action(struct ixgbe_adapter *adapter, int ifindex,

				  u8 *queue, u64 *action)

{

	struct ixgbe_ring_feature *vmdq = &adapter->ring_feature[RING_F_VMDQ];

	unsigned int num_vfs = adapter->num_vfs, vf;

	struct upper_walk_data data;

	struct net_device *upper;
@@ -9050,11 +9052,7 @@ static int handle_redirect_action(struct ixgbe_adapter *adapter, int ifindex, 
	for (vf = 0; vf < num_vfs; ++vf) {

		upper = pci_get_drvdata(adapter->vfinfo[vf].vfdev);

		if (upper->ifindex == ifindex) {

			if (adapter->num_rx_pools > 1)

				*queue = vf * 2;

			else

				*queue = vf * adapter->num_rx_queues_per_pool;



			*queue = vf * __ALIGN_MASK(1, ~vmdq->mask);

			*action = vf + 1;

			*action <<= ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;

			return 0;