[dpdk-stable] [DPDK 18.11] net/i40e: fix recreating flexible flow director rule

[Steve Yang]

From: Guinan Sun <guinanx.sun at intel.com>

[ upstream commit 0acf70d473072fd77b667a0419f8b9ab70b35b39 ]

This patch fixes the failure of recreate flexible fdir rule.
The root cause is that the flex_mask_flag is not reset during
flow destroy and flow flush.

Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
Cc: stable at dpdk.org

Acked-by: Qi Zhang <qi.z.zhang at intel.com>

Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 6 ++++++
 drivers/net/i40e/i40e_flow.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 35be846fbd..fc58647998 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1626,6 +1626,12 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
 			rte_free(fdir_filter);
 	} else {
 		ret = i40e_sw_fdir_filter_del(pf, &node->fdir.input);
+		if (ret < 0) {
+			PMD_DRV_LOG(ERR,
+				"Error deleting fdir rule from hash table!");
+			return -EINVAL;
+		}
+		pf->fdir.flex_mask_flag[pctype] = 0;
 	}
 
 	return ret;
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 2198473411..6e3e6b8447 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4965,8 +4965,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
 		}
 
 		for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;
-		     pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++)
+		     pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) {
 			pf->fdir.inset_flag[pctype] = 0;
+			pf->fdir.flex_mask_flag[pctype] = 0;
+		}
 	}
 
 	return ret;
-- 
2.17.1