* [PATCH net 1/2] nfp: flower: replace CFI with vlan present
2019-03-30 2:04 [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit Jakub Kicinski
@ 2019-03-30 2:04 ` Jakub Kicinski
2019-03-30 2:04 ` [PATCH net 2/2] nfp: flower: remove vlan CFI bit from push vlan action Jakub Kicinski
2019-04-02 1:03 ` [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit David Miller
2 siblings, 0 replies; 9+ messages in thread
From: Jakub Kicinski @ 2019-03-30 2:04 UTC (permalink / raw)
To: davem
Cc: netdev, oss-drivers, Pieter Jansen van Vuuren, Louis Peens,
Jakub Kicinski
From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Replace vlan CFI bit with a vlan present bit that indicates the
presence of a vlan tag. Previously the driver incorrectly assumed
that an vlan id of 0 is not matchable, therefore we indicate vlan
presence with a vlan present bit.
Fixes: 5571e8c9f241 ("nfp: extend flower matching capabilities")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: Louis Peens <louis.peens@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
.../net/ethernet/netronome/nfp/flower/cmsg.h | 2 +-
.../net/ethernet/netronome/nfp/flower/match.c | 27 +++++++++----------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index 4fcaf11ed56e..08ed777b86d2 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -26,7 +26,7 @@
#define NFP_FLOWER_LAYER2_GENEVE_OP BIT(6)
#define NFP_FLOWER_MASK_VLAN_PRIO GENMASK(15, 13)
-#define NFP_FLOWER_MASK_VLAN_CFI BIT(12)
+#define NFP_FLOWER_MASK_VLAN_PRESENT BIT(12)
#define NFP_FLOWER_MASK_VLAN_VID GENMASK(11, 0)
#define NFP_FLOWER_MASK_MPLS_LB GENMASK(31, 12)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c
index e03c8ef2c28c..9b8b843d0340 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/match.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c
@@ -30,20 +30,19 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *ext,
flow_rule_match_vlan(rule, &match);
/* Populate the tci field. */
- if (match.key->vlan_id || match.key->vlan_priority) {
- tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
- match.key->vlan_priority) |
- FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
- match.key->vlan_id) |
- NFP_FLOWER_MASK_VLAN_CFI;
- ext->tci = cpu_to_be16(tmp_tci);
- tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
- match.mask->vlan_priority) |
- FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
- match.mask->vlan_id) |
- NFP_FLOWER_MASK_VLAN_CFI;
- msk->tci = cpu_to_be16(tmp_tci);
- }
+ tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;
+ tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
+ match.key->vlan_priority) |
+ FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
+ match.key->vlan_id);
+ ext->tci = cpu_to_be16(tmp_tci);
+
+ tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;
+ tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
+ match.mask->vlan_priority) |
+ FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
+ match.mask->vlan_id);
+ msk->tci = cpu_to_be16(tmp_tci);
}
}
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH net 2/2] nfp: flower: remove vlan CFI bit from push vlan action
2019-03-30 2:04 [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit Jakub Kicinski
2019-03-30 2:04 ` [PATCH net 1/2] nfp: flower: replace CFI with vlan present Jakub Kicinski
@ 2019-03-30 2:04 ` Jakub Kicinski
2019-04-02 1:03 ` [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit David Miller
2 siblings, 0 replies; 9+ messages in thread
From: Jakub Kicinski @ 2019-03-30 2:04 UTC (permalink / raw)
To: davem
Cc: netdev, oss-drivers, Pieter Jansen van Vuuren, Louis Peens,
Jakub Kicinski
From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
We no longer set CFI when pushing vlan tags, therefore we remove
the CFI bit from push vlan.
Fixes: 1a1e586f54bf ("nfp: add basic action capabilities to flower offloads")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: Louis Peens <louis.peens@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +--
drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index eeda4ed98333..e336f6ee94f5 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -48,8 +48,7 @@ nfp_fl_push_vlan(struct nfp_fl_push_vlan *push_vlan,
tmp_push_vlan_tci =
FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, act->vlan.prio) |
- FIELD_PREP(NFP_FL_PUSH_VLAN_VID, act->vlan.vid) |
- NFP_FL_PUSH_VLAN_CFI;
+ FIELD_PREP(NFP_FL_PUSH_VLAN_VID, act->vlan.vid);
push_vlan->vlan_tci = cpu_to_be16(tmp_push_vlan_tci);
}
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index 08ed777b86d2..0ed51e79db00 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -82,7 +82,6 @@
#define NFP_FL_OUT_FLAGS_TYPE_IDX GENMASK(2, 0)
#define NFP_FL_PUSH_VLAN_PRIO GENMASK(15, 13)
-#define NFP_FL_PUSH_VLAN_CFI BIT(12)
#define NFP_FL_PUSH_VLAN_VID GENMASK(11, 0)
#define IPV6_FLOW_LABEL_MASK cpu_to_be32(0x000fffff)
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit
2019-03-30 2:04 [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit Jakub Kicinski
2019-03-30 2:04 ` [PATCH net 1/2] nfp: flower: replace CFI with vlan present Jakub Kicinski
2019-03-30 2:04 ` [PATCH net 2/2] nfp: flower: remove vlan CFI bit from push vlan action Jakub Kicinski
@ 2019-04-02 1:03 ` David Miller
2019-04-02 1:13 ` Jakub Kicinski
2 siblings, 1 reply; 9+ messages in thread
From: David Miller @ 2019-04-02 1:03 UTC (permalink / raw)
To: jakub.kicinski; +Cc: netdev, oss-drivers
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Fri, 29 Mar 2019 19:04:42 -0700
> This patch clears up some confusion around the meaning of bit 12
> for FW messages related to VLAN and flower offload.
>
> Pieter says:
> It fixes issues with matching, pushing and popping vlan tags.
> We replace the vlan CFI bit with a vlan present bit that
> indicates the presence of a vlan tag. We also no longer set
> the CFI when pushing vlan tags.
Series applied, thanks Jakub.
Stable?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit
2019-04-02 1:03 ` [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit David Miller
@ 2019-04-02 1:13 ` Jakub Kicinski
2019-04-02 1:31 ` David Miller
0 siblings, 1 reply; 9+ messages in thread
From: Jakub Kicinski @ 2019-04-02 1:13 UTC (permalink / raw)
To: David Miller; +Cc: netdev, oss-drivers
On Mon, 01 Apr 2019 18:03:00 -0700 (PDT), David Miller wrote:
> From: Jakub Kicinski <jakub.kicinski@netronome.com>
> Date: Fri, 29 Mar 2019 19:04:42 -0700
>
> > This patch clears up some confusion around the meaning of bit 12
> > for FW messages related to VLAN and flower offload.
> >
> > Pieter says:
> > It fixes issues with matching, pushing and popping vlan tags.
> > We replace the vlan CFI bit with a vlan present bit that
> > indicates the presence of a vlan tag. We also no longer set
> > the CFI when pushing vlan tags.
>
> Series applied, thanks Jakub.
>
> Stable?
It would be nice, but they will both conflict with Pablo's changes :(
Especially patch 1 is quite different since Pablo merged key and mask
handling into one function. The old patch would have been:
@@ -65,15 +64,13 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *frame,
flow_vlan = skb_flow_dissector_target(flow->dissector,
FLOW_DISSECTOR_KEY_VLAN,
target);
/* Populate the tci field. */
+ tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;
- if (flow_vlan->vlan_id || flow_vlan->vlan_priority) {
- tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
- flow_vlan->vlan_priority) |
- FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
- flow_vlan->vlan_id) |
- NFP_FLOWER_MASK_VLAN_CFI;
- frame->tci = cpu_to_be16(tmp_tci);
- }
+ tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
+ flow_vlan->vlan_priority) |
+ FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
+ flow_vlan->vlan_id);
+ frame->tci = cpu_to_be16(tmp_tci);
}
}
Second conflict is just an irrelevant change in context. How would we
handle this?
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH net 0/2] nfp: flower: fix matching and pushing vlan CFI bit
2019-04-02 1:13 ` Jakub Kicinski
@ 2019-04-02 1:31 ` David Miller
2019-04-02 2:36 ` [PATCH stable/5.0 " Jakub Kicinski
0 siblings, 1 reply; 9+ messages in thread
From: David Miller @ 2019-04-02 1:31 UTC (permalink / raw)
To: jakub.kicinski; +Cc: netdev, oss-drivers
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Mon, 1 Apr 2019 18:13:28 -0700
> How would we handle this?
You can do the backport to say, 5.0, and post it to the list.
I'll mark it "Not Applicable" in patchwork but add it to the stable
bundle.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH stable/5.0 0/2] nfp: flower: fix matching and pushing vlan CFI bit
2019-04-02 1:31 ` David Miller
@ 2019-04-02 2:36 ` Jakub Kicinski
2019-04-02 2:36 ` [PATCH stable/5.0 1/2] nfp: flower: replace CFI with vlan present Jakub Kicinski
2019-04-02 2:36 ` [PATCH stable/5.0 2/2] nfp: flower: remove vlan CFI bit from push vlan action Jakub Kicinski
0 siblings, 2 replies; 9+ messages in thread
From: Jakub Kicinski @ 2019-04-02 2:36 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Jakub Kicinski
This is a backport of d1b58fc60758 ("Merge branch 'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit'") onto tag v5.0.5.
Pieter Jansen van Vuuren (2):
nfp: flower: replace CFI with vlan present
nfp: flower: remove vlan CFI bit from push vlan action
drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +--
drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 3 +--
drivers/net/ethernet/netronome/nfp/flower/match.c | 14 ++++++--------
3 files changed, 8 insertions(+), 12 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH stable/5.0 1/2] nfp: flower: replace CFI with vlan present
2019-04-02 2:36 ` [PATCH stable/5.0 " Jakub Kicinski
@ 2019-04-02 2:36 ` Jakub Kicinski
2019-04-02 2:36 ` [PATCH stable/5.0 2/2] nfp: flower: remove vlan CFI bit from push vlan action Jakub Kicinski
1 sibling, 0 replies; 9+ messages in thread
From: Jakub Kicinski @ 2019-04-02 2:36 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Pieter Jansen van Vuuren, Louis Peens
From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Replace vlan CFI bit with a vlan present bit that indicates the
presence of a vlan tag. Previously the driver incorrectly assumed
that an vlan id of 0 is not matchable, therefore we indicate vlan
presence with a vlan present bit.
Fixes: 5571e8c9f241 ("nfp: extend flower matching capabilities")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: Louis Peens <louis.peens@netronome.com>
---
drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 +-
drivers/net/ethernet/netronome/nfp/flower/match.c | 14 ++++++--------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index 15f41cfef9f1..bf06458288f3 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -26,7 +26,7 @@
#define NFP_FLOWER_LAYER2_GENEVE_OP BIT(6)
#define NFP_FLOWER_MASK_VLAN_PRIO GENMASK(15, 13)
-#define NFP_FLOWER_MASK_VLAN_CFI BIT(12)
+#define NFP_FLOWER_MASK_VLAN_PRESENT BIT(12)
#define NFP_FLOWER_MASK_VLAN_VID GENMASK(11, 0)
#define NFP_FLOWER_MASK_MPLS_LB GENMASK(31, 12)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c
index cdf75595f627..571cc8ced33e 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/match.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c
@@ -26,14 +26,12 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *frame,
FLOW_DISSECTOR_KEY_VLAN,
target);
/* Populate the tci field. */
- if (flow_vlan->vlan_id || flow_vlan->vlan_priority) {
- tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
- flow_vlan->vlan_priority) |
- FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
- flow_vlan->vlan_id) |
- NFP_FLOWER_MASK_VLAN_CFI;
- frame->tci = cpu_to_be16(tmp_tci);
- }
+ tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;
+ tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,
+ flow_vlan->vlan_priority) |
+ FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,
+ flow_vlan->vlan_id);
+ frame->tci = cpu_to_be16(tmp_tci);
}
}
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH stable/5.0 2/2] nfp: flower: remove vlan CFI bit from push vlan action
2019-04-02 2:36 ` [PATCH stable/5.0 " Jakub Kicinski
2019-04-02 2:36 ` [PATCH stable/5.0 1/2] nfp: flower: replace CFI with vlan present Jakub Kicinski
@ 2019-04-02 2:36 ` Jakub Kicinski
1 sibling, 0 replies; 9+ messages in thread
From: Jakub Kicinski @ 2019-04-02 2:36 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Pieter Jansen van Vuuren, Louis Peens
From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
We no longer set CFI when pushing vlan tags, therefore we remove
the CFI bit from push vlan.
Fixes: 1a1e586f54bf ("nfp: add basic action capabilities to flower offloads")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: Louis Peens <louis.peens@netronome.com>
---
drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +--
drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index 8d54b36afee8..2bbc5b8f92c2 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -49,8 +49,7 @@ nfp_fl_push_vlan(struct nfp_fl_push_vlan *push_vlan,
tmp_push_vlan_tci =
FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, tcf_vlan_push_prio(action)) |
- FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action)) |
- NFP_FL_PUSH_VLAN_CFI;
+ FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action));
push_vlan->vlan_tci = cpu_to_be16(tmp_push_vlan_tci);
}
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index bf06458288f3..ab07d76b4186 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -82,7 +82,6 @@
#define NFP_FL_OUT_FLAGS_TYPE_IDX GENMASK(2, 0)
#define NFP_FL_PUSH_VLAN_PRIO GENMASK(15, 13)
-#define NFP_FL_PUSH_VLAN_CFI BIT(12)
#define NFP_FL_PUSH_VLAN_VID GENMASK(11, 0)
#define IPV6_FLOW_LABEL_MASK cpu_to_be32(0x000fffff)
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread