* [dpdk-dev] [PATCH v2] net/i40e: fix flex payload rule conflict issue
2020-12-29 5:46 [dpdk-dev] [PATCH] net/i40e: fix flex payload rule conflict issue beilei.xing
@ 2020-12-29 6:17 ` beilei.xing
2020-12-28 7:15 ` Guo, Jia
2021-01-01 4:03 ` [dpdk-dev] [PATCH v3] " beilei.xing
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: beilei.xing @ 2020-12-29 6:17 UTC (permalink / raw)
To: jia.guo, dev; +Cc: Beilei Xing, stable, Chenmin Sun
From: Beilei Xing <beilei.xing@intel.com>
With the following commands, the second flow can't
be created successfully.
1. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 0102030405 / end
actions drop / end
2. flow destroy 0 rule 0
3. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 010203040506 / end
actions drop / end
The root cause is that a flag for flex pit isn't reset.
Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
Cc: stable@dpdk.org
Reported-by: Chenmin Sun<chenmin.sun@intel.com>
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
v2 changes:
- Add fix line.
- Refine comments.
drivers/net/i40e/i40e_flow.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index b09ff6590d..65e0b69356 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -5284,6 +5284,7 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
enum rte_filter_type filter_type = flow->filter_type;
struct i40e_fdir_info *fdir_info = &pf->fdir;
int ret = 0;
+ int i;
switch (filter_type) {
case RTE_ETH_FILTER_ETHERTYPE:
@@ -5299,9 +5300,13 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
&((struct i40e_fdir_filter *)flow->rule)->fdir,
0);
- /* If the last flow is destroyed, disable fdir. */
+ /* When the last flow is destroyed. */
if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
+ /* Disable FDIR processing. */
i40e_fdir_rx_proc_enable(dev, 0);
+ /* Reset the flex_pit_flag. */
+ for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
+ pf->fdir.flex_pit_flag[i] = 0;
}
break;
case RTE_ETH_FILTER_HASH:
@@ -5515,6 +5520,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
pf->fdir.flex_mask_flag[pctype] = 0;
}
+ for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
+ pf->fdir.flex_pit_flag[i] = 0;
+
/* Disable FDIR processing as all FDIR rules are now flushed */
i40e_fdir_rx_proc_enable(dev, 0);
}
--
2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/i40e: fix flex payload rule conflict issue
2020-12-29 6:17 ` [dpdk-dev] [PATCH v2] " beilei.xing
@ 2020-12-28 7:15 ` Guo, Jia
0 siblings, 0 replies; 10+ messages in thread
From: Guo, Jia @ 2020-12-28 7:15 UTC (permalink / raw)
To: Xing, Beilei, dev; +Cc: stable, Sun, Chenmin
Hi, beilei
> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Tuesday, December 29, 2020 2:18 PM
> To: Guo, Jia <jia.guo@intel.com>; dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; stable@dpdk.org; Sun, Chenmin
> <chenmin.sun@intel.com>
> Subject: [PATCH v2] net/i40e: fix flex payload rule conflict issue
>
> From: Beilei Xing <beilei.xing@intel.com>
>
> With the following commands, the second flow can't be created successfully.
>
> 1. flow create 0 ingress pattern eth / ipv4 / udp /
> raw relative is 1 pattern is 0102030405 / end
> actions drop / end
> 2. flow destroy 0 rule 0
> 3. flow create 0 ingress pattern eth / ipv4 / udp /
> raw relative is 1 pattern is 010203040506 / end
> actions drop / end
>
> The root cause is that a flag for flex pit isn't reset.
>
> Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
> Cc: stable@dpdk.org
>
> Reported-by: Chenmin Sun<chenmin.sun@intel.com>
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
>
> v2 changes:
> - Add fix line.
> - Refine comments.
>
> drivers/net/i40e/i40e_flow.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
> index b09ff6590d..65e0b69356 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -5284,6 +5284,7 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
> enum rte_filter_type filter_type = flow->filter_type;
> struct i40e_fdir_info *fdir_info = &pf->fdir;
> int ret = 0;
> + int i;
>
> switch (filter_type) {
> case RTE_ETH_FILTER_ETHERTYPE:
> @@ -5299,9 +5300,13 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
> &((struct i40e_fdir_filter *)flow->rule)->fdir,
> 0);
>
> - /* If the last flow is destroyed, disable fdir. */
> + /* When the last flow is destroyed. */
> if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
> + /* Disable FDIR processing. */
> i40e_fdir_rx_proc_enable(dev, 0);
> + /* Reset the flex_pit_flag. */
> + for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
> + pf->fdir.flex_pit_flag[i] = 0;
Why reset all flex_pit_flag when destroy the last flow, if destroy other flow, is it no need to reset corresponding flex_pit_flag which set before when the flow added?
And reset flag should be ahead of the FDIR disabling I think.
> }
> break;
> case RTE_ETH_FILTER_HASH:
> @@ -5515,6 +5520,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
> pf->fdir.flex_mask_flag[pctype] = 0;
> }
>
> + for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
> + pf->fdir.flex_pit_flag[i] = 0;
> +
> /* Disable FDIR processing as all FDIR rules are now flushed
> */
> i40e_fdir_rx_proc_enable(dev, 0);
> }
> --
> 2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dpdk-dev] [PATCH v3] net/i40e: fix flex payload rule conflict issue
2020-12-29 5:46 [dpdk-dev] [PATCH] net/i40e: fix flex payload rule conflict issue beilei.xing
2020-12-29 6:17 ` [dpdk-dev] [PATCH v2] " beilei.xing
@ 2021-01-01 4:03 ` beilei.xing
2020-12-31 6:07 ` Guo, Jia
2021-01-05 3:12 ` [dpdk-dev] [PATCH v5] " beilei.xing
2021-01-06 2:51 ` [dpdk-dev] [PATCH v4] " beilei.xing
3 siblings, 1 reply; 10+ messages in thread
From: beilei.xing @ 2021-01-01 4:03 UTC (permalink / raw)
To: jia.guo, dev; +Cc: Beilei Xing, stable, Chenmin Sun
From: Beilei Xing <beilei.xing@intel.com>
With the following commands, the second flow can't
be created successfully.
1. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 0102030405 / end
actions drop / end
2. flow destroy 0 rule 0
3. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 010203040506 / end
actions drop / end
The root cause is that a flag for flex pit isn't reset.
Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
Cc: stable@dpdk.org
Reported-by: Chenmin Sun<chenmin.sun@intel.com>
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
v3 changes:
- Add flow count for flexible payload flow.
v2 changeds:
- Add fix line.
drivers/net/i40e/i40e_ethdev.h | 3 +++
drivers/net/i40e/i40e_fdir.c | 16 ++++++++++++++--
drivers/net/i40e/i40e_flow.c | 4 ++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 696c5aaf7e..aac226999c 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -636,6 +636,7 @@ struct i40e_fdir_flow_ext {
bool is_udp; /* ipv4|ipv6 udp flow */
enum i40e_flxpld_layer_idx layer_idx;
struct i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER * I40E_MAX_FLXPLD_FIED];
+ bool is_flex_flow;
};
/* A structure used to define the input for a flow director filter entry */
@@ -784,6 +785,8 @@ struct i40e_fdir_info {
bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set */
+
+ uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
};
/* Ethertype filter number HW supports */
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 50c0eee9f2..4400b607c8 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -355,6 +355,7 @@ i40e_init_flx_pld(struct i40e_pf *pf)
I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non-used*/
I40E_WRITE_REG(hw,
I40E_PRTQF_FLX_PIT(index + 2), 0x0000FC2A);/*non-used*/
+ pf->fdir.flex_pit_flag[i] = 0;
}
/* initialize the masks */
@@ -1513,8 +1514,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(field_idx), flx_pit);
min_next_off++;
}
-
- pf->fdir.flex_pit_flag[layer_idx] = 1;
}
static int
@@ -1738,6 +1737,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
fdir_info->fdir_guarantee_free_space > 0)
wait_status = false;
} else {
+ layer_idx = filter->input.flow_ext.layer_idx;
+
node = i40e_sw_fdir_filter_lookup(fdir_info,
&check_filter.fdir.input);
if (!node) {
@@ -1785,6 +1786,17 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
goto error_op;
}
+ if (filter->input.flow_ext.is_flex_flow) {
+ if (add) {
+ fdir_info->flex_flow_count[layer_idx]++;
+ pf->fdir.flex_pit_flag[layer_idx] = 1;
+ } else {
+ fdir_info->flex_flow_count[layer_idx]--;
+ if (!fdir_info->flex_flow_count[layer_idx])
+ pf->fdir.flex_pit_flag[layer_idx] = 0;
+ }
+ }
+
if (add) {
fdir_info->fdir_actual_cnt++;
if (fdir_info->fdir_invalprio == 1 &&
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index b09ff6590d..bbd666b7a0 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3069,6 +3069,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
&flex_pit, sizeof(struct i40e_fdir_flex_pit));
filter->input.flow_ext.layer_idx = layer_idx;
filter->input.flow_ext.raw_id = raw_id;
+ filter->input.flow_ext.is_flex_flow = true;
break;
case RTE_FLOW_ITEM_TYPE_VF:
vf_spec = item->spec;
@@ -5515,6 +5516,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
pf->fdir.flex_mask_flag[pctype] = 0;
}
+ for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
+ pf->fdir.flex_pit_flag[i] = 0;
+
/* Disable FDIR processing as all FDIR rules are now flushed */
i40e_fdir_rx_proc_enable(dev, 0);
}
--
2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [dpdk-dev] [PATCH v3] net/i40e: fix flex payload rule conflict issue
2021-01-01 4:03 ` [dpdk-dev] [PATCH v3] " beilei.xing
@ 2020-12-31 6:07 ` Guo, Jia
2021-01-05 2:36 ` Xing, Beilei
0 siblings, 1 reply; 10+ messages in thread
From: Guo, Jia @ 2020-12-31 6:07 UTC (permalink / raw)
To: Xing, Beilei, dev; +Cc: stable, Sun, Chenmin
> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Friday, January 1, 2021 12:04 PM
> To: Guo, Jia <jia.guo@intel.com>; dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; stable@dpdk.org; Sun, Chenmin
> <chenmin.sun@intel.com>
> Subject: [PATCH v3] net/i40e: fix flex payload rule conflict issue
>
> From: Beilei Xing <beilei.xing@intel.com>
>
> With the following commands, the second flow can't be created successfully.
>
> 1. flow create 0 ingress pattern eth / ipv4 / udp /
> raw relative is 1 pattern is 0102030405 / end
> actions drop / end
> 2. flow destroy 0 rule 0
> 3. flow create 0 ingress pattern eth / ipv4 / udp /
> raw relative is 1 pattern is 010203040506 / end
> actions drop / end
>
> The root cause is that a flag for flex pit isn't reset.
>
> Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
> Cc: stable@dpdk.org
>
> Reported-by: Chenmin Sun<chenmin.sun@intel.com>
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
>
> v3 changes:
> - Add flow count for flexible payload flow.
> v2 changeds:
> - Add fix line.
>
> drivers/net/i40e/i40e_ethdev.h | 3 +++
> drivers/net/i40e/i40e_fdir.c | 16 ++++++++++++++--
> drivers/net/i40e/i40e_flow.c | 4 ++++
> 3 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.h
> b/drivers/net/i40e/i40e_ethdev.h index 696c5aaf7e..aac226999c 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -636,6 +636,7 @@ struct i40e_fdir_flow_ext {
> bool is_udp; /* ipv4|ipv6 udp flow */
> enum i40e_flxpld_layer_idx layer_idx;
> struct i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER *
> I40E_MAX_FLXPLD_FIED];
> + bool is_flex_flow;
> };
>
> /* A structure used to define the input for a flow director filter entry */ @@
> -784,6 +785,8 @@ struct i40e_fdir_info {
> bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
>
> bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set
> */
> +
> + uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
> };
>
> /* Ethertype filter number HW supports */ diff --git
> a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index
> 50c0eee9f2..4400b607c8 100644
> --- a/drivers/net/i40e/i40e_fdir.c
> +++ b/drivers/net/i40e/i40e_fdir.c
> @@ -355,6 +355,7 @@ i40e_init_flx_pld(struct i40e_pf *pf)
> I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non-
> used*/
> I40E_WRITE_REG(hw,
> I40E_PRTQF_FLX_PIT(index + 2), 0x0000FC2A);/*non-
> used*/
> + pf->fdir.flex_pit_flag[i] = 0;
> }
>
> /* initialize the masks */
> @@ -1513,8 +1514,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
> I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(field_idx),
> flx_pit);
> min_next_off++;
> }
> -
> - pf->fdir.flex_pit_flag[layer_idx] = 1;
> }
>
> static int
> @@ -1738,6 +1737,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev
> *dev,
> fdir_info->fdir_guarantee_free_space > 0)
> wait_status = false;
> } else {
> + layer_idx = filter->input.flow_ext.layer_idx;
> +
Assume that flow_ext.layer_idx should be assign to the layer_idx at the condition of " (!filter->input.flow_ext.customized_pctype) ", right?
> node = i40e_sw_fdir_filter_lookup(fdir_info,
> &check_filter.fdir.input);
> if (!node) {
> @@ -1785,6 +1786,17 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev
> *dev,
> goto error_op;
> }
>
> + if (filter->input.flow_ext.is_flex_flow) {
> + if (add) {
> + fdir_info->flex_flow_count[layer_idx]++;
> + pf->fdir.flex_pit_flag[layer_idx] = 1;
> + } else {
> + fdir_info->flex_flow_count[layer_idx]--;
> + if (!fdir_info->flex_flow_count[layer_idx])
> + pf->fdir.flex_pit_flag[layer_idx] = 0;
> + }
> + }
> +
> if (add) {
> fdir_info->fdir_actual_cnt++;
> if (fdir_info->fdir_invalprio == 1 && diff --git
> a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> b09ff6590d..bbd666b7a0 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -3069,6 +3069,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev
> *dev,
> &flex_pit, sizeof(struct i40e_fdir_flex_pit));
> filter->input.flow_ext.layer_idx = layer_idx;
> filter->input.flow_ext.raw_id = raw_id;
> + filter->input.flow_ext.is_flex_flow = true;
> break;
> case RTE_FLOW_ITEM_TYPE_VF:
> vf_spec = item->spec;
> @@ -5515,6 +5516,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
> pf->fdir.flex_mask_flag[pctype] = 0;
> }
>
> + for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
> + pf->fdir.flex_pit_flag[i] = 0;
> +
> /* Disable FDIR processing as all FDIR rules are now flushed
> */
> i40e_fdir_rx_proc_enable(dev, 0);
> }
> --
> 2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [dpdk-dev] [PATCH v3] net/i40e: fix flex payload rule conflict issue
2020-12-31 6:07 ` Guo, Jia
@ 2021-01-05 2:36 ` Xing, Beilei
0 siblings, 0 replies; 10+ messages in thread
From: Xing, Beilei @ 2021-01-05 2:36 UTC (permalink / raw)
To: Guo, Jia, dev; +Cc: stable, Sun, Chenmin
> -----Original Message-----
> From: Guo, Jia <jia.guo@intel.com>
> Sent: Thursday, December 31, 2020 2:07 PM
> To: Xing, Beilei <beilei.xing@intel.com>; dev@dpdk.org
> Cc: stable@dpdk.org; Sun, Chenmin <chenmin.sun@intel.com>
> Subject: RE: [PATCH v3] net/i40e: fix flex payload rule conflict issue
>
>
> > -----Original Message-----
> > From: Xing, Beilei <beilei.xing@intel.com>
> > Sent: Friday, January 1, 2021 12:04 PM
> > To: Guo, Jia <jia.guo@intel.com>; dev@dpdk.org
> > Cc: Xing, Beilei <beilei.xing@intel.com>; stable@dpdk.org; Sun,
> > Chenmin <chenmin.sun@intel.com>
> > Subject: [PATCH v3] net/i40e: fix flex payload rule conflict issue
> >
> > From: Beilei Xing <beilei.xing@intel.com>
> >
> > With the following commands, the second flow can't be created successfully.
> >
> > 1. flow create 0 ingress pattern eth / ipv4 / udp /
> > raw relative is 1 pattern is 0102030405 / end
> > actions drop / end
> > 2. flow destroy 0 rule 0
> > 3. flow create 0 ingress pattern eth / ipv4 / udp /
> > raw relative is 1 pattern is 010203040506 / end
> > actions drop / end
> >
> > The root cause is that a flag for flex pit isn't reset.
> >
> > Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for
> > FDIR")
> > Cc: stable@dpdk.org
> >
> > Reported-by: Chenmin Sun<chenmin.sun@intel.com>
> > Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> > ---
> >
> > v3 changes:
> > - Add flow count for flexible payload flow.
> > v2 changeds:
> > - Add fix line.
> >
> > drivers/net/i40e/i40e_ethdev.h | 3 +++
> > drivers/net/i40e/i40e_fdir.c | 16 ++++++++++++++--
> > drivers/net/i40e/i40e_flow.c | 4 ++++
> > 3 files changed, 21 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.h
> > b/drivers/net/i40e/i40e_ethdev.h index 696c5aaf7e..aac226999c 100644
> > --- a/drivers/net/i40e/i40e_ethdev.h
> > +++ b/drivers/net/i40e/i40e_ethdev.h
> > @@ -636,6 +636,7 @@ struct i40e_fdir_flow_ext { bool is_udp; /*
> > ipv4|ipv6 udp flow */ enum i40e_flxpld_layer_idx layer_idx; struct
> > i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER *
> > I40E_MAX_FLXPLD_FIED];
> > +bool is_flex_flow;
> > };
> >
> > /* A structure used to define the input for a flow director filter
> > entry */ @@
> > -784,6 +785,8 @@ struct i40e_fdir_info { bool
> > flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
> >
> > bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set
> > */
> > +
> > +uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
> > };
> >
> > /* Ethertype filter number HW supports */ diff --git
> > a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index
> > 50c0eee9f2..4400b607c8 100644
> > --- a/drivers/net/i40e/i40e_fdir.c
> > +++ b/drivers/net/i40e/i40e_fdir.c
> > @@ -355,6 +355,7 @@ i40e_init_flx_pld(struct i40e_pf *pf)
> > I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non- used*/
> > I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(index + 2), 0x0000FC2A);/*non-
> > used*/
> > +pf->fdir.flex_pit_flag[i] = 0;
> > }
> >
> > /* initialize the masks */
> > @@ -1513,8 +1514,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
> > I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(field_idx), flx_pit);
> > min_next_off++; }
> > -
> > -pf->fdir.flex_pit_flag[layer_idx] = 1;
> > }
> >
> > static int
> > @@ -1738,6 +1737,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev
> > *dev, fdir_info->fdir_guarantee_free_space > 0) wait_status = false;
> > } else {
> > +layer_idx = filter->input.flow_ext.layer_idx;
> > +
>
> Assume that flow_ext.layer_idx should be assign to the layer_idx at the
> condition of " (!filter->input.flow_ext.customized_pctype) ", right?
Yes, thanks for the comment, will fix in next version.
>
> > node = i40e_sw_fdir_filter_lookup(fdir_info,
> > &check_filter.fdir.input);
> > if (!node) {
> > @@ -1785,6 +1786,17 @@ i40e_flow_add_del_fdir_filter(struct
> > rte_eth_dev *dev, goto error_op; }
> >
> > +if (filter->input.flow_ext.is_flex_flow) { if (add) {
> > +fdir_info->flex_flow_count[layer_idx]++;
> > +pf->fdir.flex_pit_flag[layer_idx] = 1;
> > +} else {
> > +fdir_info->flex_flow_count[layer_idx]--;
> > +if (!fdir_info->flex_flow_count[layer_idx])
> > +pf->fdir.flex_pit_flag[layer_idx] = 0;
> > +}
> > +}
> > +
> > if (add) {
> > fdir_info->fdir_actual_cnt++;
> > if (fdir_info->fdir_invalprio == 1 && diff --git
> > a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> > b09ff6590d..bbd666b7a0 100644
> > --- a/drivers/net/i40e/i40e_flow.c
> > +++ b/drivers/net/i40e/i40e_flow.c
> > @@ -3069,6 +3069,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev
> > *dev,
> > &flex_pit, sizeof(struct i40e_fdir_flex_pit));
> > filter->input.flow_ext.layer_idx = layer_idx;
> > filter->input.flow_ext.raw_id = raw_id;
> > +filter->input.flow_ext.is_flex_flow = true;
> > break;
> > case RTE_FLOW_ITEM_TYPE_VF:
> > vf_spec = item->spec;
> > @@ -5515,6 +5516,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
> > pf->fdir.flex_mask_flag[pctype] = 0; }
> >
> > +for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
> > +pf->fdir.flex_pit_flag[i] = 0;
> > +
> > /* Disable FDIR processing as all FDIR rules are now flushed */
> > i40e_fdir_rx_proc_enable(dev, 0); }
> > --
> > 2.26.2
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dpdk-dev] [PATCH v5] net/i40e: fix flex payload rule conflict issue
2020-12-29 5:46 [dpdk-dev] [PATCH] net/i40e: fix flex payload rule conflict issue beilei.xing
2020-12-29 6:17 ` [dpdk-dev] [PATCH v2] " beilei.xing
2021-01-01 4:03 ` [dpdk-dev] [PATCH v3] " beilei.xing
@ 2021-01-05 3:12 ` beilei.xing
2021-01-05 3:39 ` Guo, Jia
2021-01-06 2:51 ` [dpdk-dev] [PATCH v4] " beilei.xing
3 siblings, 1 reply; 10+ messages in thread
From: beilei.xing @ 2021-01-05 3:12 UTC (permalink / raw)
To: jia.guo, dev; +Cc: Beilei Xing, stable, Chenmin Sun
From: Beilei Xing <beilei.xing@intel.com>
With the following commands, the second flow can't
be created successfully.
1. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 0102030405 / end
actions drop / end
2. flow destroy 0 rule 0
3. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 010203040506 / end
actions drop / end
The root cause is that a flag for flex pit isn't reset.
Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
Cc: stable@dpdk.org
Reported-by: Chenmin Sun<chenmin.sun@intel.com>
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
v4 changes:
- Code refine.
v3 changes:
- Add flow count for flexible payload flow.
v2 changeds:
- Add fix line.
drivers/net/i40e/i40e_ethdev.h | 3 +++
drivers/net/i40e/i40e_fdir.c | 19 ++++++++++++++++---
drivers/net/i40e/i40e_flow.c | 4 ++++
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 696c5aaf7e..aac226999c 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -636,6 +636,7 @@ struct i40e_fdir_flow_ext {
bool is_udp; /* ipv4|ipv6 udp flow */
enum i40e_flxpld_layer_idx layer_idx;
struct i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER * I40E_MAX_FLXPLD_FIED];
+ bool is_flex_flow;
};
/* A structure used to define the input for a flow director filter entry */
@@ -784,6 +785,8 @@ struct i40e_fdir_info {
bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set */
+
+ uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
};
/* Ethertype filter number HW supports */
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 50c0eee9f2..0343e8b09a 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -355,6 +355,7 @@ i40e_init_flx_pld(struct i40e_pf *pf)
I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non-used*/
I40E_WRITE_REG(hw,
I40E_PRTQF_FLX_PIT(index + 2), 0x0000FC2A);/*non-used*/
+ pf->fdir.flex_pit_flag[i] = 0;
}
/* initialize the masks */
@@ -1513,8 +1514,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(field_idx), flx_pit);
min_next_off++;
}
-
- pf->fdir.flex_pit_flag[layer_idx] = 1;
}
static int
@@ -1686,7 +1685,7 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
i40e_fdir_filter_convert(filter, &check_filter);
if (add) {
- if (!filter->input.flow_ext.customized_pctype) {
+ if (filter->input.flow_ext.is_flex_flow) {
for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
layer_idx = filter->input.flow_ext.layer_idx;
field_idx = layer_idx * I40E_MAX_FLXPLD_FIED + i;
@@ -1738,6 +1737,9 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
fdir_info->fdir_guarantee_free_space > 0)
wait_status = false;
} else {
+ if (filter->input.flow_ext.is_flex_flow)
+ layer_idx = filter->input.flow_ext.layer_idx;
+
node = i40e_sw_fdir_filter_lookup(fdir_info,
&check_filter.fdir.input);
if (!node) {
@@ -1785,6 +1787,17 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
goto error_op;
}
+ if (filter->input.flow_ext.is_flex_flow) {
+ if (add) {
+ fdir_info->flex_flow_count[layer_idx]++;
+ pf->fdir.flex_pit_flag[layer_idx] = 1;
+ } else {
+ fdir_info->flex_flow_count[layer_idx]--;
+ if (!fdir_info->flex_flow_count[layer_idx])
+ pf->fdir.flex_pit_flag[layer_idx] = 0;
+ }
+ }
+
if (add) {
fdir_info->fdir_actual_cnt++;
if (fdir_info->fdir_invalprio == 1 &&
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index b09ff6590d..bbd666b7a0 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3069,6 +3069,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
&flex_pit, sizeof(struct i40e_fdir_flex_pit));
filter->input.flow_ext.layer_idx = layer_idx;
filter->input.flow_ext.raw_id = raw_id;
+ filter->input.flow_ext.is_flex_flow = true;
break;
case RTE_FLOW_ITEM_TYPE_VF:
vf_spec = item->spec;
@@ -5515,6 +5516,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
pf->fdir.flex_mask_flag[pctype] = 0;
}
+ for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
+ pf->fdir.flex_pit_flag[i] = 0;
+
/* Disable FDIR processing as all FDIR rules are now flushed */
i40e_fdir_rx_proc_enable(dev, 0);
}
--
2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [dpdk-dev] [PATCH v5] net/i40e: fix flex payload rule conflict issue
2021-01-05 3:12 ` [dpdk-dev] [PATCH v5] " beilei.xing
@ 2021-01-05 3:39 ` Guo, Jia
2021-01-05 12:33 ` Zhang, Qi Z
0 siblings, 1 reply; 10+ messages in thread
From: Guo, Jia @ 2021-01-05 3:39 UTC (permalink / raw)
To: Xing, Beilei, dev; +Cc: stable, Sun, Chenmin
Acked-by: Jeff Guo <jia.guo@intel.com>
> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Tuesday, January 5, 2021 11:13 AM
> To: Guo, Jia <jia.guo@intel.com>; dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; stable@dpdk.org; Sun, Chenmin
> <chenmin.sun@intel.com>
> Subject: [PATCH v5] net/i40e: fix flex payload rule conflict issue
>
> From: Beilei Xing <beilei.xing@intel.com>
>
> With the following commands, the second flow can't be created successfully.
>
> 1. flow create 0 ingress pattern eth / ipv4 / udp /
> raw relative is 1 pattern is 0102030405 / end
> actions drop / end
> 2. flow destroy 0 rule 0
> 3. flow create 0 ingress pattern eth / ipv4 / udp /
> raw relative is 1 pattern is 010203040506 / end
> actions drop / end
>
> The root cause is that a flag for flex pit isn't reset.
>
> Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
> Cc: stable@dpdk.org
>
> Reported-by: Chenmin Sun<chenmin.sun@intel.com>
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
>
> v4 changes:
> - Code refine.
> v3 changes:
> - Add flow count for flexible payload flow.
> v2 changeds:
> - Add fix line.
>
> drivers/net/i40e/i40e_ethdev.h | 3 +++
> drivers/net/i40e/i40e_fdir.c | 19 ++++++++++++++++---
> drivers/net/i40e/i40e_flow.c | 4 ++++
> 3 files changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.h
> b/drivers/net/i40e/i40e_ethdev.h index 696c5aaf7e..aac226999c 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -636,6 +636,7 @@ struct i40e_fdir_flow_ext {
> bool is_udp; /* ipv4|ipv6 udp flow */
> enum i40e_flxpld_layer_idx layer_idx;
> struct i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER *
> I40E_MAX_FLXPLD_FIED];
> + bool is_flex_flow;
> };
>
> /* A structure used to define the input for a flow director filter entry */ @@
> -784,6 +785,8 @@ struct i40e_fdir_info {
> bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
>
> bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set
> */
> +
> + uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
> };
>
> /* Ethertype filter number HW supports */ diff --git
> a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index
> 50c0eee9f2..0343e8b09a 100644
> --- a/drivers/net/i40e/i40e_fdir.c
> +++ b/drivers/net/i40e/i40e_fdir.c
> @@ -355,6 +355,7 @@ i40e_init_flx_pld(struct i40e_pf *pf)
> I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non-
> used*/
> I40E_WRITE_REG(hw,
> I40E_PRTQF_FLX_PIT(index + 2), 0x0000FC2A);/*non-
> used*/
> + pf->fdir.flex_pit_flag[i] = 0;
> }
>
> /* initialize the masks */
> @@ -1513,8 +1514,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
> I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(field_idx),
> flx_pit);
> min_next_off++;
> }
> -
> - pf->fdir.flex_pit_flag[layer_idx] = 1;
> }
>
> static int
> @@ -1686,7 +1685,7 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev
> *dev,
> i40e_fdir_filter_convert(filter, &check_filter);
>
> if (add) {
> - if (!filter->input.flow_ext.customized_pctype) {
> + if (filter->input.flow_ext.is_flex_flow) {
> for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
> layer_idx = filter->input.flow_ext.layer_idx;
> field_idx = layer_idx *
> I40E_MAX_FLXPLD_FIED + i; @@ -1738,6 +1737,9 @@
> i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
> fdir_info->fdir_guarantee_free_space > 0)
> wait_status = false;
> } else {
> + if (filter->input.flow_ext.is_flex_flow)
> + layer_idx = filter->input.flow_ext.layer_idx;
> +
> node = i40e_sw_fdir_filter_lookup(fdir_info,
> &check_filter.fdir.input);
> if (!node) {
> @@ -1785,6 +1787,17 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev
> *dev,
> goto error_op;
> }
>
> + if (filter->input.flow_ext.is_flex_flow) {
> + if (add) {
> + fdir_info->flex_flow_count[layer_idx]++;
> + pf->fdir.flex_pit_flag[layer_idx] = 1;
> + } else {
> + fdir_info->flex_flow_count[layer_idx]--;
> + if (!fdir_info->flex_flow_count[layer_idx])
> + pf->fdir.flex_pit_flag[layer_idx] = 0;
> + }
> + }
> +
> if (add) {
> fdir_info->fdir_actual_cnt++;
> if (fdir_info->fdir_invalprio == 1 && diff --git
> a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> b09ff6590d..bbd666b7a0 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -3069,6 +3069,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev
> *dev,
> &flex_pit, sizeof(struct i40e_fdir_flex_pit));
> filter->input.flow_ext.layer_idx = layer_idx;
> filter->input.flow_ext.raw_id = raw_id;
> + filter->input.flow_ext.is_flex_flow = true;
> break;
> case RTE_FLOW_ITEM_TYPE_VF:
> vf_spec = item->spec;
> @@ -5515,6 +5516,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
> pf->fdir.flex_mask_flag[pctype] = 0;
> }
>
> + for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
> + pf->fdir.flex_pit_flag[i] = 0;
> +
> /* Disable FDIR processing as all FDIR rules are now flushed
> */
> i40e_fdir_rx_proc_enable(dev, 0);
> }
> --
> 2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [dpdk-dev] [PATCH v5] net/i40e: fix flex payload rule conflict issue
2021-01-05 3:39 ` Guo, Jia
@ 2021-01-05 12:33 ` Zhang, Qi Z
0 siblings, 0 replies; 10+ messages in thread
From: Zhang, Qi Z @ 2021-01-05 12:33 UTC (permalink / raw)
To: Guo, Jia, Xing, Beilei, dev; +Cc: stable, Sun, Chenmin
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Guo, Jia
> Sent: Tuesday, January 5, 2021 11:40 AM
> To: Xing, Beilei <beilei.xing@intel.com>; dev@dpdk.org
> Cc: stable@dpdk.org; Sun, Chenmin <chenmin.sun@intel.com>
> Subject: Re: [dpdk-dev] [PATCH v5] net/i40e: fix flex payload rule conflict issue
>
> Acked-by: Jeff Guo <jia.guo@intel.com>
>
> > -----Original Message-----
> > From: Xing, Beilei <beilei.xing@intel.com>
> > Sent: Tuesday, January 5, 2021 11:13 AM
> > To: Guo, Jia <jia.guo@intel.com>; dev@dpdk.org
> > Cc: Xing, Beilei <beilei.xing@intel.com>; stable@dpdk.org; Sun,
> > Chenmin <chenmin.sun@intel.com>
> > Subject: [PATCH v5] net/i40e: fix flex payload rule conflict issue
> >
> > From: Beilei Xing <beilei.xing@intel.com>
> >
> > With the following commands, the second flow can't be created successfully.
> >
> > 1. flow create 0 ingress pattern eth / ipv4 / udp /
> > raw relative is 1 pattern is 0102030405 / end
> > actions drop / end
> > 2. flow destroy 0 rule 0
> > 3. flow create 0 ingress pattern eth / ipv4 / udp /
> > raw relative is 1 pattern is 010203040506 / end
> > actions drop / end
> >
> > The root cause is that a flag for flex pit isn't reset.
> >
> > Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for
> > FDIR")
> > Cc: stable@dpdk.org
> >
> > Reported-by: Chenmin Sun<chenmin.sun@intel.com>
> > Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dpdk-dev] [PATCH v4] net/i40e: fix flex payload rule conflict issue
2020-12-29 5:46 [dpdk-dev] [PATCH] net/i40e: fix flex payload rule conflict issue beilei.xing
` (2 preceding siblings ...)
2021-01-05 3:12 ` [dpdk-dev] [PATCH v5] " beilei.xing
@ 2021-01-06 2:51 ` beilei.xing
3 siblings, 0 replies; 10+ messages in thread
From: beilei.xing @ 2021-01-06 2:51 UTC (permalink / raw)
To: jia.guo, dev; +Cc: Beilei Xing, stable, Chenmin Sun
From: Beilei Xing <beilei.xing@intel.com>
With the following commands, the second flow can't
be created successfully.
1. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 0102030405 / end
actions drop / end
2. flow destroy 0 rule 0
3. flow create 0 ingress pattern eth / ipv4 / udp /
raw relative is 1 pattern is 010203040506 / end
actions drop / end
The root cause is that a flag for flex pit isn't reset.
Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
Cc: stable@dpdk.org
Reported-by: Chenmin Sun<chenmin.sun@intel.com>
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
v4 changes:
- Code refine.
v3 changes:
- Add flow count for flexible payload flow.
v2 changeds:
- Add fix line.
drivers/net/i40e/i40e_ethdev.h | 3 +++
drivers/net/i40e/i40e_fdir.c | 19 ++++++++++++++++---
drivers/net/i40e/i40e_flow.c | 4 ++++
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 696c5aaf7e..aac226999c 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -636,6 +636,7 @@ struct i40e_fdir_flow_ext {
bool is_udp; /* ipv4|ipv6 udp flow */
enum i40e_flxpld_layer_idx layer_idx;
struct i40e_fdir_flex_pit flex_pit[I40E_MAX_FLXPLD_LAYER * I40E_MAX_FLXPLD_FIED];
+ bool is_flex_flow;
};
/* A structure used to define the input for a flow director filter entry */
@@ -784,6 +785,8 @@ struct i40e_fdir_info {
bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX];
bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set */
+
+ uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER];
};
/* Ethertype filter number HW supports */
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 50c0eee9f2..0343e8b09a 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -355,6 +355,7 @@ i40e_init_flx_pld(struct i40e_pf *pf)
I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non-used*/
I40E_WRITE_REG(hw,
I40E_PRTQF_FLX_PIT(index + 2), 0x0000FC2A);/*non-used*/
+ pf->fdir.flex_pit_flag[i] = 0;
}
/* initialize the masks */
@@ -1513,8 +1514,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(field_idx), flx_pit);
min_next_off++;
}
-
- pf->fdir.flex_pit_flag[layer_idx] = 1;
}
static int
@@ -1686,7 +1685,7 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
i40e_fdir_filter_convert(filter, &check_filter);
if (add) {
- if (!filter->input.flow_ext.customized_pctype) {
+ if (filter->input.flow_ext.is_flex_flow) {
for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
layer_idx = filter->input.flow_ext.layer_idx;
field_idx = layer_idx * I40E_MAX_FLXPLD_FIED + i;
@@ -1738,6 +1737,9 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
fdir_info->fdir_guarantee_free_space > 0)
wait_status = false;
} else {
+ if (filter->input.flow_ext.is_flex_flow)
+ layer_idx = filter->input.flow_ext.layer_idx;
+
node = i40e_sw_fdir_filter_lookup(fdir_info,
&check_filter.fdir.input);
if (!node) {
@@ -1785,6 +1787,17 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
goto error_op;
}
+ if (filter->input.flow_ext.is_flex_flow) {
+ if (add) {
+ fdir_info->flex_flow_count[layer_idx]++;
+ pf->fdir.flex_pit_flag[layer_idx] = 1;
+ } else {
+ fdir_info->flex_flow_count[layer_idx]--;
+ if (!fdir_info->flex_flow_count[layer_idx])
+ pf->fdir.flex_pit_flag[layer_idx] = 0;
+ }
+ }
+
if (add) {
fdir_info->fdir_actual_cnt++;
if (fdir_info->fdir_invalprio == 1 &&
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index b09ff6590d..bbd666b7a0 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3069,6 +3069,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
&flex_pit, sizeof(struct i40e_fdir_flex_pit));
filter->input.flow_ext.layer_idx = layer_idx;
filter->input.flow_ext.raw_id = raw_id;
+ filter->input.flow_ext.is_flex_flow = true;
break;
case RTE_FLOW_ITEM_TYPE_VF:
vf_spec = item->spec;
@@ -5515,6 +5516,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
pf->fdir.flex_mask_flag[pctype] = 0;
}
+ for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++)
+ pf->fdir.flex_pit_flag[i] = 0;
+
/* Disable FDIR processing as all FDIR rules are now flushed */
i40e_fdir_rx_proc_enable(dev, 0);
}
--
2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread