i40e: Disallow ip4 and ip6 l4_4_bytes

[ Upstream commit d64aaf3f7869f915fd120763d75f11d6b116424d ]

Return -EOPNOTSUPP, when user requests l4_4_bytes for raw IP4 or
IP6 flow director filters. Flow director does not support filtering
on l4 bytes for PCTYPEs used by IP4 and IP6 filters.
Without this patch, user could create filters with l4_4_bytes fields,
which did not do any filtering on L4, but only on L3 fields.

Fixes: 36777d9fa24c ("i40e: check current configured input set when adding ntuple filters")
Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: Kamil Maziarz  <kamil.maziarz@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 4e32432..8138896 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -4364,11 +4364,7 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi,
                        return -EOPNOTSUPP;
 
                /* First 4 bytes of L4 header */
-               if (usr_ip4_spec->l4_4_bytes == htonl(0xFFFFFFFF))
-                       new_mask |= I40E_L4_SRC_MASK | I40E_L4_DST_MASK;
-               else if (!usr_ip4_spec->l4_4_bytes)
-                       new_mask &= ~(I40E_L4_SRC_MASK | I40E_L4_DST_MASK);
-               else
+               if (usr_ip4_spec->l4_4_bytes)
                        return -EOPNOTSUPP;
 
                /* Filtering on Type of Service is not supported. */
@@ -4407,11 +4403,7 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi,
                else
                        return -EOPNOTSUPP;
 
-               if (usr_ip6_spec->l4_4_bytes == htonl(0xFFFFFFFF))
-                       new_mask |= I40E_L4_SRC_MASK | I40E_L4_DST_MASK;
-               else if (!usr_ip6_spec->l4_4_bytes)
-                       new_mask &= ~(I40E_L4_SRC_MASK | I40E_L4_DST_MASK);
-               else
+               if (usr_ip6_spec->l4_4_bytes)
                        return -EOPNOTSUPP;
 
                /* Filtering on Traffic class is not supported. */