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

Commit fe92d894 authored by Radoslaw Tyl's avatar Radoslaw Tyl Committed by Greg Kroah-Hartman
Browse files

ixgbe: Fix crash with VFs and flow director on interface flap 



[ Upstream commit 5d826d209164b0752c883607be4cdbbcf7cab494 ]

This patch fix crash when we have restore flow director filters after reset
adapter. In ixgbe_fdir_filter_restore() filter->action is outside of the
rx_ring array, as it has a VF identifier in the upper 32 bits.

Signed-off-by: default avatarRadoslaw Tyl <radoslawx.tyl@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 57176df1

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

+8 −2
Original line number Diff line number Diff line
@@ -4804,6 +4804,7 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter) 
	struct ixgbe_hw *hw = &adapter->hw;

	struct hlist_node *node2;

	struct ixgbe_fdir_filter *filter;

	u64 action;



	spin_lock(&adapter->fdir_perfect_lock);
@@ -4812,12 +4813,17 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter) 


	hlist_for_each_entry_safe(filter, node2,

				  &adapter->fdir_filter_list, fdir_node) {

		action = filter->action;

		if (action != IXGBE_FDIR_DROP_QUEUE && action != 0)

			action =

			(action >> ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF) - 1;



		ixgbe_fdir_write_perfect_filter_82599(hw,

				&filter->filter,

				filter->sw_idx,

				(filter->action == IXGBE_FDIR_DROP_QUEUE) ?

				(action == IXGBE_FDIR_DROP_QUEUE) ?

				IXGBE_FDIR_DROP_QUEUE :

				adapter->rx_ring[filter->action]->reg_idx);

				adapter->rx_ring[action]->reg_idx);

	}



	spin_unlock(&adapter->fdir_perfect_lock);