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

Commit 6e982aea authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Clear stale pool mappings 



This patch makes certain that we clear the pool mappings added when we
configure default MAC addresses for the interface.  Without this we run the
risk of leaking an address into pool 0 which really belongs to VF 0 when
SR-IOV is enabled.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e1d0a2af

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

+7 −3
Original line number Diff line number Diff line
@@ -1083,12 +1083,16 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) 


	/* Add the SAN MAC address to the RAR only if it's a valid address */

	if (is_valid_ether_addr(hw->mac.san_addr)) {

		hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,

				    hw->mac.san_addr, 0, IXGBE_RAH_AV);



		/* Save the SAN MAC RAR index */

		hw->mac.san_mac_rar_index = hw->mac.num_rar_entries - 1;



		hw->mac.ops.set_rar(hw, hw->mac.san_mac_rar_index,

				    hw->mac.san_addr, 0, IXGBE_RAH_AV);



		/* clear VMDq pool/queue selection for this RAR */

		hw->mac.ops.clear_vmdq(hw, hw->mac.san_mac_rar_index,

				       IXGBE_CLEAR_VMDQ_ALL);



		/* Reserve the last RAR for the SAN MAC address */

		hw->mac.num_rar_entries--;

	}

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

+4 −3
Original line number Diff line number Diff line
@@ -1884,10 +1884,11 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw) 
		hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);



		hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);

	}



	/*  clear VMDq pool/queue selection for RAR 0 */

	hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);

	}



	hw->addr_ctrl.overflow_promisc = 0;



	hw->addr_ctrl.rar_used_count = 1;

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

+7 −3
Original line number Diff line number Diff line
@@ -154,12 +154,16 @@ s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw) 


	/* Add the SAN MAC address to the RAR only if it's a valid address */

	if (is_valid_ether_addr(hw->mac.san_addr)) {

		hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,

				    hw->mac.san_addr, 0, IXGBE_RAH_AV);



		/* Save the SAN MAC RAR index */

		hw->mac.san_mac_rar_index = hw->mac.num_rar_entries - 1;



		hw->mac.ops.set_rar(hw, hw->mac.san_mac_rar_index,

				    hw->mac.san_addr, 0, IXGBE_RAH_AV);



		/* clear VMDq pool/queue selection for this RAR */

		hw->mac.ops.clear_vmdq(hw, hw->mac.san_mac_rar_index,

				       IXGBE_CLEAR_VMDQ_ALL);



		/* Reserve the last RAR for the SAN MAC address */

		hw->mac.num_rar_entries--;

	}