ixgbe: Fix calculation of queue with VFs and flow director on interface flap
Subsystems (3)
PATCH 1/1 ixgbe: Fix calculation of queue with VFs and flow director on interface flap
This patch fixes the calculation of queue when we restore flow director filters after resetting adapter. In ixgbe_fdir_filter_restore(), filter's vf may be zero which makes the queue outside of the rx_ring array.
The calculation is changed to the same as ixgbe_add_ethtool_fdir_entry().
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 +++++++++++++++++++-------- 1 file changed, 27 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +27 -10
@@ -5239,7 +5239,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; +u8 queue;spin_lock (&adapter->fdir_perfect_lock);
@@ -5248,17 +5248,34 @@ 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 ; +if (filter->action ==IXGBE_FDIR_DROP_QUEUE ) { + queue =IXGBE_FDIR_DROP_QUEUE ; + }else { +u32 ring =ethtool_get_flow_spec_ring (filter->action); +u8 vf =ethtool_get_flow_spec_ring_vf (filter->action); + +if (!vf && (ring >= adapter->num_rx_queues)) { +e_err (drv,"FDIR restore failed without VF, " +"ring: %u\n" , ring); +continue ; + }else if (vf && + ((vf > adapter->num_vfs) || + ring >= adapter->num_rx_queues_per_pool)) { +e_err (drv,"FDIR restore failed with VF, " +"vf: %hhu, ring: %u\n" , vf, ring); +continue ; + } + +/* Map the ring onto the absolute queue index */ +if (!vf) + queue = adapter->rx_ring[ring]->reg_idx; +else + queue = ((vf -1 ) * + adapter->num_rx_queues_per_pool) + ring; + }ixgbe_fdir_write_perfect_filter_82599 (hw, - &filter->filter, - filter->sw_idx, - (action ==IXGBE_FDIR_DROP_QUEUE ) ? -IXGBE_FDIR_DROP_QUEUE : - adapter->rx_ring[action]->reg_idx); + &filter->filter, filter->sw_idx, queue); }spin_unlock (&adapter->fdir_perfect_lock);
Signature · 1 line
2.16.5
PATCH 1/1 ixgbe: Fix calculation of queue with VFs and flow director on interface flap
Dear Zhu
Please next time send patch directly to Intel-wired-lan. All Linux kernel patch submissions and issues reported against Intel wired Ethernet LAN kernel drivers should use this list.
Quoted 8 lines
This patch fixes the calculation of queue when we restore flow director filters after resetting adapter. In
ixgbe_fdir_filter_restore(), filter's vf may be zero which makes the queue outside of therx_ringarray.The calculation is changed to the same as
ixgbe_add_ethtool_fdir_entry().Signed-off-by Cambda Zhu <[email protected]>
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Cambda Zhu
Sent: Wednesday, November 27, 2019 1:04 AM
To: Kirsher, Jeffrey T <[email protected]>
Cc: Cambda Zhu <[email protected]>; Tyl, RadoslawX <[email protected]>; netdev at vger.kernel.org; Joseph Qi <[email protected]>; intel-wired-lan at lists.osuosl.org; David S. Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH] ixgbe: Fix calculation of queue with VFs and flow director on interface flapThis patch fixes the calculation of queue when we restore flow director filters after resetting adapter. In
ixgbe_fdir_filter_restore(), filter's vf may be zero which makes the queue outside of therx_ringarray.
Quoted 7 lines
The calculation is changed to the same as
ixgbe_add_ethtool_fdir_entry().Signed-off-by Cambda Zhu <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 +++++++++++++++++++-------- 1 file changed, 27 insertions(+), 10 deletions(-)