* [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
@ 2018-07-11 9:46 Andrew Rybchenko
2018-07-23 17:10 ` Luca Boccassi
0 siblings, 1 reply; 9+ messages in thread
From: Andrew Rybchenko @ 2018-07-11 9:46 UTC (permalink / raw)
To: arybchik; +Cc: stable
TCI may contain PCP or DEI bits. Matching of these bits is not
supported, but the bits still may be set in specification value and
not covered by mask. So, these bits should be ignored.
Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
Cc: stable@dpdk.org
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
---
drivers/net/sfc/sfc_flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 5613d59a9..18387415e 100644
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct rte_flow_item *item,
* the outer tag and the next matches the inner tag.
*/
if (mask->tci == supp_mask.tci) {
- vid = rte_bswap16(spec->tci);
+ /* Apply mask to keep VID only */
+ vid = rte_bswap16(spec->tci & mask->tci);
if (!(efx_spec->efs_match_flags &
EFX_FILTER_MATCH_OUTER_VID)) {
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-07-11 9:46 [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI Andrew Rybchenko
@ 2018-07-23 17:10 ` Luca Boccassi
2018-07-26 9:42 ` Andrew Rybchenko
0 siblings, 1 reply; 9+ messages in thread
From: Luca Boccassi @ 2018-07-23 17:10 UTC (permalink / raw)
To: Andrew Rybchenko, arybchik; +Cc: stable
On Wed, 2018-07-11 at 10:46 +0100, Andrew Rybchenko wrote:
> TCI may contain PCP or DEI bits. Matching of these bits is not
> supported, but the bits still may be set in specification value and
> not covered by mask. So, these bits should be ignored.
>
> Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
> Cc: stable@dpdk.org
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
> ---
> drivers/net/sfc/sfc_flow.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
> index 5613d59a9..18387415e 100644
> --- a/drivers/net/sfc/sfc_flow.c
> +++ b/drivers/net/sfc/sfc_flow.c
> @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct rte_flow_item
> *item,
> * the outer tag and the next matches the inner tag.
> */
> if (mask->tci == supp_mask.tci) {
> - vid = rte_bswap16(spec->tci);
> + /* Apply mask to keep VID only */
> + vid = rte_bswap16(spec->tci & mask->tci);
>
> if (!(efx_spec->efs_match_flags &
> EFX_FILTER_MATCH_OUTER_VID)) {
Hi Andrew,
For which stable release branch is this patch intended? Has it (or an
equivalent) been merged into mainline?
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-07-23 17:10 ` Luca Boccassi
@ 2018-07-26 9:42 ` Andrew Rybchenko
2018-07-26 9:46 ` Luca Boccassi
0 siblings, 1 reply; 9+ messages in thread
From: Andrew Rybchenko @ 2018-07-26 9:42 UTC (permalink / raw)
To: Luca Boccassi, arybchik; +Cc: stable
On 23.07.2018 20:10, Luca Boccassi wrote:
> On Wed, 2018-07-11 at 10:46 +0100, Andrew Rybchenko wrote:
>> TCI may contain PCP or DEI bits. Matching of these bits is not
>> supported, but the bits still may be set in specification value and
>> not covered by mask. So, these bits should be ignored.
>>
>> Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
>> ---
>> drivers/net/sfc/sfc_flow.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
>> index 5613d59a9..18387415e 100644
>> --- a/drivers/net/sfc/sfc_flow.c
>> +++ b/drivers/net/sfc/sfc_flow.c
>> @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct rte_flow_item
>> *item,
>> * the outer tag and the next matches the inner tag.
>> */
>> if (mask->tci == supp_mask.tci) {
>> - vid = rte_bswap16(spec->tci);
>> + /* Apply mask to keep VID only */
>> + vid = rte_bswap16(spec->tci & mask->tci);
>>
>> if (!(efx_spec->efs_match_flags &
>> EFX_FILTER_MATCH_OUTER_VID)) {
> Hi Andrew,
>
> For which stable release branch is this patch intended? Has it (or an
> equivalent) been merged into mainline?
Hi Luka,
Yes, the patch is applied in mainline [1].
It would be good if it is applied to 17.11, 18.02 and 18.05 stable branches.
[1]
https://git.dpdk.org/dpdk/commit/?id=8028142107a858a146bfdbaa010b7e77ff987342
Thanks,
Andrew.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-07-26 9:42 ` Andrew Rybchenko
@ 2018-07-26 9:46 ` Luca Boccassi
2018-07-26 9:50 ` Andrew Rybchenko
0 siblings, 1 reply; 9+ messages in thread
From: Luca Boccassi @ 2018-07-26 9:46 UTC (permalink / raw)
To: Andrew Rybchenko, arybchik; +Cc: stable
On Thu, 2018-07-26 at 12:42 +0300, Andrew Rybchenko wrote:
> On 23.07.2018 20:10, Luca Boccassi wrote:
> > On Wed, 2018-07-11 at 10:46 +0100, Andrew Rybchenko wrote:
> > > TCI may contain PCP or DEI bits. Matching of these bits is not
> > > supported, but the bits still may be set in specification value
> > > and
> > > not covered by mask. So, these bits should be ignored.
> > >
> > > Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
> > > Cc: stable@dpdk.org
> > >
> > > Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> > > Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
> > > ---
> > > drivers/net/sfc/sfc_flow.c | 3 ++-
> > > 1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/net/sfc/sfc_flow.c
> > > b/drivers/net/sfc/sfc_flow.c
> > > index 5613d59a9..18387415e 100644
> > > --- a/drivers/net/sfc/sfc_flow.c
> > > +++ b/drivers/net/sfc/sfc_flow.c
> > > @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct
> > > rte_flow_item
> > > *item,
> > > * the outer tag and the next matches the inner tag.
> > > */
> > > if (mask->tci == supp_mask.tci) {
> > > - vid = rte_bswap16(spec->tci);
> > > + /* Apply mask to keep VID only */
> > > + vid = rte_bswap16(spec->tci & mask->tci);
> > >
> > > if (!(efx_spec->efs_match_flags &
> > > EFX_FILTER_MATCH_OUTER_VID)) {
> >
> > Hi Andrew,
> >
> > For which stable release branch is this patch intended? Has it (or
> > an
> > equivalent) been merged into mainline?
>
> Hi Luka,
>
> Yes, the patch is applied in mainline [1].
>
> It would be good if it is applied to 17.11, 18.02 and 18.05 stable
> branches.
>
> [1]
> https://git.dpdk.org/dpdk/commit/?id=8028142107a858a146bfdbaa010b7e77
> ff987342
>
> Thanks,
> Andrew.
Ok, thanks, in the future please use --subject-prefix='PATCH xx.yy'
with git send-email to indicate the target branch(es)
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-07-26 9:46 ` Luca Boccassi
@ 2018-07-26 9:50 ` Andrew Rybchenko
2018-07-26 9:52 ` Andrew Rybchenko
0 siblings, 1 reply; 9+ messages in thread
From: Andrew Rybchenko @ 2018-07-26 9:50 UTC (permalink / raw)
To: Luca Boccassi, Andrew Rybchenko; +Cc: stable
On 26.07.2018 12:46, Luca Boccassi wrote:
> On Thu, 2018-07-26 at 12:42 +0300, Andrew Rybchenko wrote:
>> On 23.07.2018 20:10, Luca Boccassi wrote:
>>> On Wed, 2018-07-11 at 10:46 +0100, Andrew Rybchenko wrote:
>>>> TCI may contain PCP or DEI bits. Matching of these bits is not
>>>> supported, but the bits still may be set in specification value
>>>> and
>>>> not covered by mask. So, these bits should be ignored.
>>>>
>>>> Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
>>>> Cc: stable@dpdk.org
>>>>
>>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>>> Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
>>>> ---
>>>> drivers/net/sfc/sfc_flow.c | 3 ++-
>>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/net/sfc/sfc_flow.c
>>>> b/drivers/net/sfc/sfc_flow.c
>>>> index 5613d59a9..18387415e 100644
>>>> --- a/drivers/net/sfc/sfc_flow.c
>>>> +++ b/drivers/net/sfc/sfc_flow.c
>>>> @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct
>>>> rte_flow_item
>>>> *item,
>>>> * the outer tag and the next matches the inner tag.
>>>> */
>>>> if (mask->tci == supp_mask.tci) {
>>>> - vid = rte_bswap16(spec->tci);
>>>> + /* Apply mask to keep VID only */
>>>> + vid = rte_bswap16(spec->tci & mask->tci);
>>>>
>>>> if (!(efx_spec->efs_match_flags &
>>>> EFX_FILTER_MATCH_OUTER_VID)) {
>>> Hi Andrew,
>>>
>>> For which stable release branch is this patch intended? Has it (or
>>> an
>>> equivalent) been merged into mainline?
>> Hi Luka,
>>
>> Yes, the patch is applied in mainline [1].
>>
>> It would be good if it is applied to 17.11, 18.02 and 18.05 stable
>> branches.
>>
>> [1]
>> https://git.dpdk.org/dpdk/commit/?id=8028142107a858a146bfdbaa010b7e77
>> ff987342
>>
>> Thanks,
>> Andrew.
> Ok, thanks, in the future please use --subject-prefix='PATCH xx.yy'
> with git send-email to indicate the target branch(es)
Sorry, but I'm not sure that I understand. It was a fix to mainline
which should be applied to stable branches as well.
As I understand PATCH xx.yy is applicable only when it is a dedicated
patch to stable release. Am I missing something?
Andrew.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-07-26 9:50 ` Andrew Rybchenko
@ 2018-07-26 9:52 ` Andrew Rybchenko
2018-07-26 10:03 ` Luca Boccassi
0 siblings, 1 reply; 9+ messages in thread
From: Andrew Rybchenko @ 2018-07-26 9:52 UTC (permalink / raw)
To: Luca Boccassi; +Cc: stable
On 26.07.2018 12:50, Andrew Rybchenko wrote:
> On 26.07.2018 12:46, Luca Boccassi wrote:
>> On Thu, 2018-07-26 at 12:42 +0300, Andrew Rybchenko wrote:
>>> On 23.07.2018 20:10, Luca Boccassi wrote:
>>>> On Wed, 2018-07-11 at 10:46 +0100, Andrew Rybchenko wrote:
>>>>> TCI may contain PCP or DEI bits. Matching of these bits is not
>>>>> supported, but the bits still may be set in specification value
>>>>> and
>>>>> not covered by mask. So, these bits should be ignored.
>>>>>
>>>>> Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
>>>>> Cc: stable@dpdk.org
>>>>>
>>>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>>>> Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
>>>>> ---
>>>>> drivers/net/sfc/sfc_flow.c | 3 ++-
>>>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/net/sfc/sfc_flow.c
>>>>> b/drivers/net/sfc/sfc_flow.c
>>>>> index 5613d59a9..18387415e 100644
>>>>> --- a/drivers/net/sfc/sfc_flow.c
>>>>> +++ b/drivers/net/sfc/sfc_flow.c
>>>>> @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct
>>>>> rte_flow_item
>>>>> *item,
>>>>> * the outer tag and the next matches the inner tag.
>>>>> */
>>>>> if (mask->tci == supp_mask.tci) {
>>>>> - vid = rte_bswap16(spec->tci);
>>>>> + /* Apply mask to keep VID only */
>>>>> + vid = rte_bswap16(spec->tci & mask->tci);
>>>>> if (!(efx_spec->efs_match_flags &
>>>>> EFX_FILTER_MATCH_OUTER_VID)) {
>>>> Hi Andrew,
>>>>
>>>> For which stable release branch is this patch intended? Has it (or
>>>> an
>>>> equivalent) been merged into mainline?
>>> Hi Luka,
>>>
>>> Yes, the patch is applied in mainline [1].
>>>
>>> It would be good if it is applied to 17.11, 18.02 and 18.05 stable
>>> branches.
>>>
>>> [1]
>>> https://git.dpdk.org/dpdk/commit/?id=8028142107a858a146bfdbaa010b7e77
>>> ff987342
>>>
>>> Thanks,
>>> Andrew.
>> Ok, thanks, in the future please use --subject-prefix='PATCH xx.yy'
>> with git send-email to indicate the target branch(es)
>
> Sorry, but I'm not sure that I understand. It was a fix to mainline
> which should be applied to stable branches as well.
> As I understand PATCH xx.yy is applicable only when it is a dedicated
> patch to stable release. Am I missing something?
Oh yes, I'm sorry. I recall that it was test send and I've missed that
stable@dpdk.org is included from the patch itself.
I'm sorry for confusion.
Andrew.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-07-26 9:52 ` Andrew Rybchenko
@ 2018-07-26 10:03 ` Luca Boccassi
0 siblings, 0 replies; 9+ messages in thread
From: Luca Boccassi @ 2018-07-26 10:03 UTC (permalink / raw)
To: Andrew Rybchenko; +Cc: stable
On Thu, 2018-07-26 at 12:52 +0300, Andrew Rybchenko wrote:
> On 26.07.2018 12:50, Andrew Rybchenko wrote:
> > On 26.07.2018 12:46, Luca Boccassi wrote:
> > > On Thu, 2018-07-26 at 12:42 +0300, Andrew Rybchenko wrote:
> > > > On 23.07.2018 20:10, Luca Boccassi wrote:
> > > > > On Wed, 2018-07-11 at 10:46 +0100, Andrew Rybchenko wrote:
> > > > > > TCI may contain PCP or DEI bits. Matching of these bits is
> > > > > > not
> > > > > > supported, but the bits still may be set in specification
> > > > > > value
> > > > > > and
> > > > > > not covered by mask. So, these bits should be ignored.
> > > > > >
> > > > > > Fixes: 894080975e1e ("net/sfc: support VLAN in flow API
> > > > > > filters")
> > > > > > Cc: stable@dpdk.org
> > > > > >
> > > > > > Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> > > > > > Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
> > > > > > ---
> > > > > > drivers/net/sfc/sfc_flow.c | 3 ++-
> > > > > > 1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > >
> > > > > > diff --git a/drivers/net/sfc/sfc_flow.c
> > > > > > b/drivers/net/sfc/sfc_flow.c
> > > > > > index 5613d59a9..18387415e 100644
> > > > > > --- a/drivers/net/sfc/sfc_flow.c
> > > > > > +++ b/drivers/net/sfc/sfc_flow.c
> > > > > > @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct
> > > > > > rte_flow_item
> > > > > > *item,
> > > > > > * the outer tag and the next matches the inner tag.
> > > > > > */
> > > > > > if (mask->tci == supp_mask.tci) {
> > > > > > - vid = rte_bswap16(spec->tci);
> > > > > > + /* Apply mask to keep VID only */
> > > > > > + vid = rte_bswap16(spec->tci & mask->tci);
> > > > > > if (!(efx_spec->efs_match_flags &
> > > > > > EFX_FILTER_MATCH_OUTER_VID)) {
> > > > >
> > > > > Hi Andrew,
> > > > >
> > > > > For which stable release branch is this patch intended? Has
> > > > > it (or
> > > > > an
> > > > > equivalent) been merged into mainline?
> > > >
> > > > Hi Luka,
> > > >
> > > > Yes, the patch is applied in mainline [1].
> > > >
> > > > It would be good if it is applied to 17.11, 18.02 and 18.05
> > > > stable
> > > > branches.
> > > >
> > > > [1]
> > > > https://git.dpdk.org/dpdk/commit/?id=8028142107a858a146bfdbaa01
> > > > 0b7e77
> > > > ff987342
> > > >
> > > > Thanks,
> > > > Andrew.
> > >
> > > Ok, thanks, in the future please use --subject-prefix='PATCH
> > > xx.yy'
> > > with git send-email to indicate the target branch(es)
> >
> > Sorry, but I'm not sure that I understand. It was a fix to mainline
> > which should be applied to stable branches as well.
> > As I understand PATCH xx.yy is applicable only when it is a
> > dedicated
> > patch to stable release. Am I missing something?
>
> Oh yes, I'm sorry. I recall that it was test send and I've missed
> that
> stable@dpdk.org is included from the patch itself.
> I'm sorry for confusion.
>
> Andrew.
Ah ok, I thought it was just for stable. No worries!
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
@ 2018-06-29 15:23 Andrew Rybchenko
2018-07-04 17:43 ` Ferruh Yigit
0 siblings, 1 reply; 9+ messages in thread
From: Andrew Rybchenko @ 2018-06-29 15:23 UTC (permalink / raw)
To: dev; +Cc: stable
TCI may contain PCP or DEI bits. Matching of these bits is not
supported, but the bits still may be set in specification value and
not covered by mask. So, these bits should be ignored.
Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
Cc: stable@dpdk.org
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
---
drivers/net/sfc/sfc_flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 5613d59a9..18387415e 100644
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct rte_flow_item *item,
* the outer tag and the next matches the inner tag.
*/
if (mask->tci == supp_mask.tci) {
- vid = rte_bswap16(spec->tci);
+ /* Apply mask to keep VID only */
+ vid = rte_bswap16(spec->tci & mask->tci);
if (!(efx_spec->efs_match_flags &
EFX_FILTER_MATCH_OUTER_VID)) {
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI
2018-06-29 15:23 Andrew Rybchenko
@ 2018-07-04 17:43 ` Ferruh Yigit
0 siblings, 0 replies; 9+ messages in thread
From: Ferruh Yigit @ 2018-07-04 17:43 UTC (permalink / raw)
To: Andrew Rybchenko, dev; +Cc: stable
On 6/29/2018 4:23 PM, Andrew Rybchenko wrote:
> TCI may contain PCP or DEI bits. Matching of these bits is not
> supported, but the bits still may be set in specification value and
> not covered by mask. So, these bits should be ignored.
>
> Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
> Cc: stable@dpdk.org
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Reviewed-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-07-26 10:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-11 9:46 [dpdk-stable] [PATCH] net/sfc: cut non VLAN ID bits from TCI Andrew Rybchenko
2018-07-23 17:10 ` Luca Boccassi
2018-07-26 9:42 ` Andrew Rybchenko
2018-07-26 9:46 ` Luca Boccassi
2018-07-26 9:50 ` Andrew Rybchenko
2018-07-26 9:52 ` Andrew Rybchenko
2018-07-26 10:03 ` Luca Boccassi
-- strict thread matches above, loose matches on Subject: below --
2018-06-29 15:23 Andrew Rybchenko
2018-07-04 17:43 ` 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).