* [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE
@ 2019-11-06 6:07 Qi Zhang
2019-11-06 15:58 ` Stillwell Jr, Paul M
2019-11-07 3:15 ` Ye Xiaolong
0 siblings, 2 replies; 4+ messages in thread
From: Qi Zhang @ 2019-11-06 6:07 UTC (permalink / raw)
To: qiming.yang; +Cc: dev, Qi Zhang
The ptype bitmap calculation for GRE packet is modified by misktake due to
commit fc845a9d78ce
("net/ice/base: fix ptype mapping pollution from GTP flow")
which is target for GTP packet. The patch rollback that part of code.
Fixes: fc845a9d78ce ("net/ice/base: fix ptype mapping pollution from GTP flow")
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
v3:
- fix commit log format.
v2:
- fix coding style issue
drivers/net/ice/base/ice_flow.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index d6e0556e7..eaa7a3b96 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -573,9 +573,11 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)
ice_and_bitmap(params->ptypes, params->ptypes, src,
ICE_FLOW_PTYPE_MAX);
} else if (hdrs & ICE_FLOW_SEG_HDR_GRE) {
- src = (const ice_bitmap_t *)ice_ptypes_gre_of;
- ice_and_bitmap(params->ptypes, params->ptypes,
- src, ICE_FLOW_PTYPE_MAX);
+ if (!i) {
+ src = (const ice_bitmap_t *)ice_ptypes_gre_of;
+ ice_and_bitmap(params->ptypes, params->ptypes,
+ src, ICE_FLOW_PTYPE_MAX);
+ }
} else if (hdrs & ICE_FLOW_SEG_HDR_GTPC) {
src = (const ice_bitmap_t *)ice_ptypes_gtpc;
ice_and_bitmap(params->ptypes, params->ptypes,
--
2.13.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE
2019-11-06 6:07 [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE Qi Zhang
@ 2019-11-06 15:58 ` Stillwell Jr, Paul M
2019-11-07 3:15 ` Ye Xiaolong
1 sibling, 0 replies; 4+ messages in thread
From: Stillwell Jr, Paul M @ 2019-11-06 15:58 UTC (permalink / raw)
To: Zhang, Qi Z, Yang, Qiming; +Cc: dev, Zhang, Qi Z
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Qi Zhang
> Sent: Tuesday, November 5, 2019 10:07 PM
> To: Yang, Qiming <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>
> Subject: [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE
>
> The ptype bitmap calculation for GRE packet is modified by misktake due to
Minor nit (if not already fixed in subsequent patch): misktake => mistake
> commit fc845a9d78ce
> ("net/ice/base: fix ptype mapping pollution from GTP flow") which is target for
> GTP packet. The patch rollback that part of code.
>
> Fixes: fc845a9d78ce ("net/ice/base: fix ptype mapping pollution from GTP flow")
>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
> v3:
> - fix commit log format.
> v2:
> - fix coding style issue
>
> drivers/net/ice/base/ice_flow.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
> index d6e0556e7..eaa7a3b96 100644
> --- a/drivers/net/ice/base/ice_flow.c
> +++ b/drivers/net/ice/base/ice_flow.c
> @@ -573,9 +573,11 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params
> *params)
> ice_and_bitmap(params->ptypes, params->ptypes, src,
> ICE_FLOW_PTYPE_MAX);
> } else if (hdrs & ICE_FLOW_SEG_HDR_GRE) {
> - src = (const ice_bitmap_t *)ice_ptypes_gre_of;
> - ice_and_bitmap(params->ptypes, params->ptypes,
> - src, ICE_FLOW_PTYPE_MAX);
> + if (!i) {
> + src = (const ice_bitmap_t *)ice_ptypes_gre_of;
> + ice_and_bitmap(params->ptypes, params-
> >ptypes,
> + src, ICE_FLOW_PTYPE_MAX);
> + }
> } else if (hdrs & ICE_FLOW_SEG_HDR_GTPC) {
> src = (const ice_bitmap_t *)ice_ptypes_gtpc;
> ice_and_bitmap(params->ptypes, params->ptypes,
> --
> 2.13.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE
2019-11-06 6:07 [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE Qi Zhang
2019-11-06 15:58 ` Stillwell Jr, Paul M
@ 2019-11-07 3:15 ` Ye Xiaolong
2019-11-07 14:38 ` Ferruh Yigit
1 sibling, 1 reply; 4+ messages in thread
From: Ye Xiaolong @ 2019-11-07 3:15 UTC (permalink / raw)
To: Qi Zhang; +Cc: qiming.yang, dev
On 11/06, Qi Zhang wrote:
>The ptype bitmap calculation for GRE packet is modified by misktake due to
>commit fc845a9d78ce
>("net/ice/base: fix ptype mapping pollution from GTP flow")
>which is target for GTP packet. The patch rollback that part of code.
>
>Fixes: fc845a9d78ce ("net/ice/base: fix ptype mapping pollution from GTP flow")
>
>Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
>---
>v3:
>- fix commit log format.
>v2:
>- fix coding style issue
>
> drivers/net/ice/base/ice_flow.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
>index d6e0556e7..eaa7a3b96 100644
>--- a/drivers/net/ice/base/ice_flow.c
>+++ b/drivers/net/ice/base/ice_flow.c
>@@ -573,9 +573,11 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)
> ice_and_bitmap(params->ptypes, params->ptypes, src,
> ICE_FLOW_PTYPE_MAX);
> } else if (hdrs & ICE_FLOW_SEG_HDR_GRE) {
>- src = (const ice_bitmap_t *)ice_ptypes_gre_of;
>- ice_and_bitmap(params->ptypes, params->ptypes,
>- src, ICE_FLOW_PTYPE_MAX);
>+ if (!i) {
>+ src = (const ice_bitmap_t *)ice_ptypes_gre_of;
>+ ice_and_bitmap(params->ptypes, params->ptypes,
>+ src, ICE_FLOW_PTYPE_MAX);
>+ }
> } else if (hdrs & ICE_FLOW_SEG_HDR_GTPC) {
> src = (const ice_bitmap_t *)ice_ptypes_gtpc;
> ice_and_bitmap(params->ptypes, params->ptypes,
>--
>2.13.6
>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
Applied to dpdk-next-net-intel with some typo fixes. Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE
2019-11-07 3:15 ` Ye Xiaolong
@ 2019-11-07 14:38 ` Ferruh Yigit
0 siblings, 0 replies; 4+ messages in thread
From: Ferruh Yigit @ 2019-11-07 14:38 UTC (permalink / raw)
To: Ye Xiaolong, Qi Zhang; +Cc: qiming.yang, dev
On 11/7/2019 3:15 AM, Ye Xiaolong wrote:
> On 11/06, Qi Zhang wrote:
>> The ptype bitmap calculation for GRE packet is modified by misktake due to
>> commit fc845a9d78ce
>> ("net/ice/base: fix ptype mapping pollution from GTP flow")
>> which is target for GTP packet. The patch rollback that part of code.
>>
>> Fixes: fc845a9d78ce ("net/ice/base: fix ptype mapping pollution from GTP flow")
>>
>> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
>> ---
>> v3:
>> - fix commit log format.
>> v2:
>> - fix coding style issue
>>
>> drivers/net/ice/base/ice_flow.c | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
>> index d6e0556e7..eaa7a3b96 100644
>> --- a/drivers/net/ice/base/ice_flow.c
>> +++ b/drivers/net/ice/base/ice_flow.c
>> @@ -573,9 +573,11 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)
>> ice_and_bitmap(params->ptypes, params->ptypes, src,
>> ICE_FLOW_PTYPE_MAX);
>> } else if (hdrs & ICE_FLOW_SEG_HDR_GRE) {
>> - src = (const ice_bitmap_t *)ice_ptypes_gre_of;
>> - ice_and_bitmap(params->ptypes, params->ptypes,
>> - src, ICE_FLOW_PTYPE_MAX);
>> + if (!i) {
>> + src = (const ice_bitmap_t *)ice_ptypes_gre_of;
>> + ice_and_bitmap(params->ptypes, params->ptypes,
>> + src, ICE_FLOW_PTYPE_MAX);
>> + }
>> } else if (hdrs & ICE_FLOW_SEG_HDR_GTPC) {
>> src = (const ice_bitmap_t *)ice_ptypes_gtpc;
>> ice_and_bitmap(params->ptypes, params->ptypes,
>> --
>> 2.13.6
>>
>
> Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
>
> Applied to dpdk-next-net-intel with some typo fixes. Thanks.
>
Squashed into relevant commit in next-net, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-07 14:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06 6:07 [dpdk-dev] [PATCH v3] net/ice/base: fix wrong ptype bitmap for GRE Qi Zhang
2019-11-06 15:58 ` Stillwell Jr, Paul M
2019-11-07 3:15 ` Ye Xiaolong
2019-11-07 14:38 ` Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).