i40e: restore TCPv4 input set when re-enabling ATR

When we re-enable ATR we need to restore the input set for TCPv4
filters, in order for ATR to function correctly. We already do this for
the normal case of re-enabling ATR when disabling ntuple support.
However, when re-enabling ATR after the last TCPv4 filter is removed (but
when ntuple support is still active), we did not restore the TCPv4
filter input set.

This can cause problems if the TCPv4 filters from FDir had changed the
input set, as ATR will no longer behave as expected.

When clearing the ATR auto-disable flag, make sure we restore the TCPv4
input set to avoid this.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index beb854208047f0f44b28ffcff1c32f3c1363de29..b78c06a1f82ce96b3de3480f12bbf413574927b6 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8156,6 +8156,15 @@ static void i40e_reenable_fdir_sb(struct i40e_pf *pf)
 static void i40e_reenable_fdir_atr(struct i40e_pf *pf)
 {
        if (pf->flags & I40E_FLAG_FD_ATR_AUTO_DISABLED) {
+               /* ATR uses the same filtering logic as SB rules. It only
+                * functions properly if the input set mask is at the default
+                * settings. It is safe to restore the default input set
+                * because there are no active TCPv4 filter rules.
+                */
+               i40e_write_fd_input_set(pf, I40E_FILTER_PCTYPE_NONF_IPV4_TCP,
+                                       I40E_L3_SRC_MASK | I40E_L3_DST_MASK |
+                                       I40E_L4_SRC_MASK | I40E_L4_DST_MASK);
+
                pf->flags &= ~I40E_FLAG_FD_ATR_AUTO_DISABLED;
                if ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&
                    (I40E_DEBUG_FD & pf->hw.debug_mask))