Re: [dpdk-dev] [PATCH v2] net/i40e: select fdir config automatically

["Xing, Beilei" <beilei.xing@intel.com>]

> -----Original Message-----
> From: Li, Xiaoyun
> Sent: Friday, September 28, 2018 7:03 PM
> To: Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> Yigit, Ferruh <ferruh.yigit@intel.com>
> Cc: dev@dpdk.org; Li, Xiaoyun <xiaoyun.li@intel.com>
> Subject: [PATCH v2] net/i40e: select fdir config automatically
> 
> I40e driver needed users to config exact fdir mode to create rte_flow rules
> but it shouldn't. This patch allows users to create rte_flow rules without
> configuring fdir mode and let the driver select the config automatically. And
> remove the workaround in flow_filtering example.
> 
> Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
> ---
> v2:
>  * Added fdir teardown in i40e_flow_flush_fdir_filter.
>  * Replace TAILQ_FIRST with TAILQ_EMPTY which is more intuitive.
>  * Remove the workaround in flow_filtering example since the driver will
>  * set the fdir config automatically.
> ---
>  drivers/net/i40e/i40e_flow.c   | 35 +++++++++++++++++++++++++++++-----
>  examples/flow_filtering/main.c | 16 ----------------
>  2 files changed, 30 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> c67b264de..68ae00a27 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -3127,6 +3127,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev
> *dev,
>  			    struct rte_flow_error *error,
>  			    union i40e_filter_t *filter)
>  {
> +	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
>  	struct i40e_fdir_filter_conf *fdir_filter =
>  		&filter->fdir_filter;
>  	int ret;
> @@ -3148,14 +3149,29 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev
> *dev,
> 
>  	if (dev->data->dev_conf.fdir_conf.mode !=
>  	    RTE_FDIR_MODE_PERFECT) {
> -		rte_flow_error_set(error, ENOTSUP,
> -				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> -				   NULL,
> -				   "Check the mode in fdir_conf.");
> -		return -rte_errno;
> +		/* Enable fdir when fdir flow is added at first time. */
> +		ret = i40e_fdir_setup(pf);
> +		if (ret != I40E_SUCCESS) {
> +			rte_flow_error_set(error, ENOTSUP,
> +					   RTE_FLOW_ERROR_TYPE_HANDLE,
> +					   NULL, "Failed to setup fdir.");
> +			return -rte_errno;
> +		}
> +		ret = i40e_fdir_configure(dev);
> +		if (ret < 0) {
> +			rte_flow_error_set(error, ENOTSUP,
> +					   RTE_FLOW_ERROR_TYPE_HANDLE,
> +					   NULL, "Failed to configure fdir.");
> +			goto err;
> +		}
> +
> +		dev->data->dev_conf.fdir_conf.mode =
> RTE_FDIR_MODE_PERFECT;
>  	}
> 
>  	return 0;
> +err:
> +	i40e_fdir_teardown(pf);
> +	return -rte_errno;
>  }
> 
>  /* Parse to get the action info of a tunnel filter @@ -4708,6 +4724,13 @@
> i40e_flow_destroy(struct rte_eth_dev *dev,
>  	case RTE_ETH_FILTER_FDIR:
>  		ret = i40e_flow_add_del_fdir_filter(dev,
>  		       &((struct i40e_fdir_filter *)flow->rule)->fdir, 0);
> +
> +		/* If the last flow is destroyed, disable fdir. */
> +		if (!ret && !TAILQ_EMPTY(&pf->fdir.fdir_list)) {

Should be if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) here?

> +			i40e_fdir_teardown(pf);
> +			dev->data->dev_conf.fdir_conf.mode =
> +				   RTE_FDIR_MODE_NONE;
> +		}
>  		break;
>  	case RTE_ETH_FILTER_HASH:
>  		ret = i40e_config_rss_filter_del(dev, @@ -4900,6 +4923,8
> @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
>  			pf->fdir.inset_flag[pctype] = 0;
>  	}
> 
> +	i40e_fdir_teardown(pf);
> +
>  	return ret;
>  }
> 
> diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
> index b3f85b563..a73d120e3 100644
> --- a/examples/flow_filtering/main.c
> +++ b/examples/flow_filtering/main.c
> @@ -131,22 +131,6 @@ init_port(void)
>  				DEV_TX_OFFLOAD_SCTP_CKSUM  |
>  				DEV_TX_OFFLOAD_TCP_TSO,
>  		},
> -		/*
> -		 * Initialize fdir_conf of rte_eth_conf.
> -		 * Fdir is used in flow filtering for I40e,
> -		 * so rte_flow rules involve some fdir
> -		 * configurations. In long term it's better
> -		 * that drivers don't require any fdir
> -		 * configuration for rte_flow, but we need to
> -		 * get this workaround so that sample app can
> -		 * run on I40e.
> -		 */
> -		.fdir_conf = {
> -			.mode = RTE_FDIR_MODE_PERFECT,
> -			.pballoc = RTE_FDIR_PBALLOC_64K,
> -			.status = RTE_FDIR_REPORT_STATUS,
> -			.drop_queue = 127,
> -		},
>  	};
>  	struct rte_eth_txconf txq_conf;
>  	struct rte_eth_rxconf rxq_conf;
> --
> 2.17.1