diff mbox series

net/i40e: select fdir config automatically

Message ID 20180928072453.6348-1-xiaoyun.li@intel.com (mailing list archive)
State Superseded, archived
Headers
Series net/i40e: select fdir config automatically |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Li, Xiaoyun Sept. 28, 2018, 7:24 a.m. UTC 
  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.

Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

Comments

Xing, Beilei Sept. 28, 2018, 8:40 a.m. UTC | #1 
> -----Original Message-----
> From: Li, Xiaoyun
> Sent: Friday, September 28, 2018 3:25 PM
> To: Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>; dev@dpdk.org
> Cc: Li, Xiaoyun <xiaoyun.li@intel.com>
> Subject: [PATCH] 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.
> 
> Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
> ---
>  drivers/net/i40e/i40e_flow.c | 33 ++++++++++++++++++++++++++++-----
>  1 file changed, 28 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> c67b264de..70ff33ac0 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_FIRST(&pf->fdir.fdir_list)) {

How about TAILQ_EMPTY which is more intuitive? 

> +			i40e_fdir_teardown(pf);
> +			dev->data->dev_conf.fdir_conf.mode =
> +				   RTE_FDIR_MODE_NONE;
> +		}

Do you consider FDIR teardown after FDIR flush?

>  		break;
>  	case RTE_ETH_FILTER_HASH:
>  		ret = i40e_config_rss_filter_del(dev,
> --
> 2.17.1
Li, Xiaoyun Sept. 28, 2018, 10:38 a.m. UTC | #2 
Will correct it in v2. Thanks.

> -----Original Message-----
> From: Xing, Beilei
> Sent: Friday, September 28, 2018 16:40
> To: Li, Xiaoyun <xiaoyun.li@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> dev@dpdk.org
> Subject: RE: [PATCH] net/i40e: select fdir config automatically
> 
> 
> 
> > -----Original Message-----
> > From: Li, Xiaoyun
> > Sent: Friday, September 28, 2018 3:25 PM
> > To: Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> > dev@dpdk.org
> > Cc: Li, Xiaoyun <xiaoyun.li@intel.com>
> > Subject: [PATCH] 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.
> >
> > Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
> > ---
> >  drivers/net/i40e/i40e_flow.c | 33 ++++++++++++++++++++++++++++-----
> >  1 file changed, 28 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_flow.c
> > b/drivers/net/i40e/i40e_flow.c index
> > c67b264de..70ff33ac0 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_FIRST(&pf->fdir.fdir_list)) {
> 
> How about TAILQ_EMPTY which is more intuitive?
> 
> > +			i40e_fdir_teardown(pf);
> > +			dev->data->dev_conf.fdir_conf.mode =
> > +				   RTE_FDIR_MODE_NONE;
> > +		}
> 
> Do you consider FDIR teardown after FDIR flush?
> 
> >  		break;
> >  	case RTE_ETH_FILTER_HASH:
> >  		ret = i40e_config_rss_filter_del(dev,
> > --
> > 2.17.1
diff mbox series

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index c67b264de..70ff33ac0 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_FIRST(&pf->fdir.fdir_list)) {
+			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,