net: sparx5: flower: cleanup sparx5_tc_flower_handler_control_usage()
Subsystems (3)
PATCH 1/2 net: sparx5: flower: cleanup sparx5_tc_flower_handler_control_usage()
Define extack locally, to reduce line lengths and future users.
Only perform fragment handling, when at least one fragment flag is set.
Remove goto, as it's only used once, and the error message is specific to that context.
Only compile tested.
--- .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +6 -7
@@ -159,13 +159,14 @@ sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st)static int sparx5_tc_flower_handler_control_usage (struct vcap_tc_flower_parse_usage *st) { +struct netlink_ext_ack *extack = st->fco->common.extack;struct flow_match_control mt;u32 value, mask;int err =0 ;flow_rule_match_control (st->frule, &mt); -if (mt.mask->flags) { +if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT |FLOW_DIS_FIRST_FRAG )) {u8 is_frag_key = !!(mt.key->flags &FLOW_DIS_IS_FRAGMENT );u8 is_frag_mask = !!(mt.mask->flags &FLOW_DIS_IS_FRAGMENT );u8 is_frag_idx = (is_frag_key <<1 ) | is_frag_mask;
@@ -190,17 +191,15 @@ sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) err =vcap_rule_add_key_u32 (st->vrule,VCAP_KF_L3_FRAGMENT_TYPE , value, mask); -if (err) - goto out; +if (err) { +NL_SET_ERR_MSG_MOD (extack,"ip_frag parse error" ); +return err; + } } st->used_keys |=BIT_ULL (FLOW_DISSECTOR_KEY_CONTROL );return err; - -out: -NL_SET_ERR_MSG_MOD (st->fco->common.extack,"ip_frag parse error" ); -return err; } static int
Signature · 1 line
2.43.0
PATCH 2/2 net: sparx5: flower: check for unsupported control flags
Use flow_rule_is_supp_control_flags() to reject filters with unsupported control flags.
In case any unsupported control flags are masked, flow_rule_is_supp_control_flags() sets a NL extended error message, and we return -EOPNOTSUPP.
Only compile-tested.
--- drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +5 -0
@@ -197,6 +197,11 @@ sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) } } +if (!flow_rule_is_supp_control_flags (FLOW_DIS_IS_FRAGMENT | +FLOW_DIS_FIRST_FRAG , + mt.mask->flags, extack)) +return -EOPNOTSUPP ; + st->used_keys |=BIT_ULL (FLOW_DISSECTOR_KEY_CONTROL );return err;
Signature · 1 line
2.43.0
Daniel Machon
maintainerRe: [PATCH net-next 2/2] net: sparx5: flower: check for unsupported control flags
Quoted 31 lines
Use
flow_rule_is_supp_control_flags()to reject filters with unsupported control flags.In case any unsupported control flags are masked,
flow_rule_is_supp_control_flags()sets a NL extended error message, and we return-EOPNOTSUPP.Only compile-tested.
Signed-off-by Asbjørn Sloth Tønnesen <[email protected]>--- drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +5
-1@@ -197,6 +197,11 @@ sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) } } +if (!flow_rule_is_supp_control_flags (FLOW_DIS_IS_FRAGMENT | +FLOW_DIS_FIRST_FRAG , + mt.mask->flags, extack)) +return -EOPNOTSUPP ; + st->used_keys |=BIT_ULL (FLOW_DISSECTOR_KEY_CONTROL );return err; --
Quoted 1 line
2.43.0
As mentioned in patch #1, use supp_flags here. Otherwise looks good.
/Daniel
Daniel Machon
maintainerHi Asbjørn,
Thank you for your patch!
Quoted 19 lines
Define extack locally, to reduce line lengths and future users.
Only perform fragment handling, when at least one fragment flag is set.
Remove goto, as it's only used once, and the error message is specific to that context.
Only compile tested.
Signed-off-by Asbjørn Sloth Tønnesen <[email protected]>--- .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +0
-0
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st) · line 162
Quoted 4 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-0@@ -159,13 +159,14 @@ sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st)static int sparx5_tc_flower_handler_control_usage (struct vcap_tc_flower_parse_usage *st) { +struct netlink_ext_ack *extack = st->fco->common.extack;
Could you please update the use of extack in all places inside this function. You are missing one place.
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st) · line 169
Quoted 8 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-1struct flow_match_control mt;u32 value, mask;int err =0 ;flow_rule_match_control (st->frule, &mt); -if (mt.mask->flags) { +if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT |FLOW_DIS_FIRST_FRAG )) {
Since these flags are used here and in the next patch, maybe assign them to a variable:
u32 supp_flags = FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG
And update the use throughout.
Quoted 26 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +4
-7u8 is_frag_key = !!(mt.key->flags &FLOW_DIS_IS_FRAGMENT );u8 is_frag_mask = !!(mt.mask->flags &FLOW_DIS_IS_FRAGMENT );u8 is_frag_idx = (is_frag_key <<1 ) | is_frag_mask;@@ -190,17 +191,15 @@ sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) err =vcap_rule_add_key_u32 (st->vrule,VCAP_KF_L3_FRAGMENT_TYPE , value, mask); -if (err) - goto out; +if (err) { +NL_SET_ERR_MSG_MOD (extack,"ip_frag parse error" ); +return err; + } } st->used_keys |=BIT_ULL (FLOW_DISSECTOR_KEY_CONTROL );return err; - -out: -NL_SET_ERR_MSG_MOD (st->fco->common.extack,"ip_frag parse error" ); -return err; } static int --
Quoted 1 line
2.43.0
Also I think you missing a cover letter for this series.
I will run the patches through our tests once the issues are addressed.
/Daniel
Hi Daniel,
Thank you for the review.
Quoted 18 lines · Daniel Machon
Hi Asbjørn,
Thank you for your patch!
Quoted 14 lines
Define extack locally, to reduce line lengths and future users.
Only perform fragment handling, when at least one fragment flag is set.
Remove goto, as it's only used once, and the error message is specific to that context.
Only compile tested.
Signed-off-by Asbjørn Sloth Tønnesen <[email protected]>--- .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
Quoted 12 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st) · line 162
Quoted 9 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-0@@ -159,13 +159,14 @@ sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st)static int sparx5_tc_flower_handler_control_usage (struct vcap_tc_flower_parse_usage *st) { +struct netlink_ext_ack *extack = st->fco->common.extack;Could you please update the use of extack in all places inside this function. You are missing one place.
Good catch, sure. It must have got lost somewhere along the way. I deliberately kept it out of the net patch, since it could wait for net-next.
Quoted 9 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st) · line 169
Quoted 8 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-1struct flow_match_control mt;u32 value, mask;int err =0 ;flow_rule_match_control (st->frule, &mt); -if (mt.mask->flags) { +if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT |FLOW_DIS_FIRST_FRAG )) {
Quoted 6 lines
Since these flags are used here and in the next patch, maybe assign them to a variable:
u32
supp_flags=FLOW_DIS_IS_FRAGMENT|FLOW_DIS_FIRST_FRAGAnd update the use throughout.
In an earlier state this patch had a #define SPARX5_FLOWER_SUPPORTED_CTLFLAGS, in the same style as nfp in drivers/net/ethernet/netronome/nfp/flower/offload.c
Right now, this driver supports all currently defined flags (which are used with mask), so the point of using flow_rule_is_supp_control_flags() to this dirver, is to make it possible to introduce new flags in the future, without having to update all drivers to explicitly not support a new flag.
My problem with using supp_flags in both places is: What happens when support for a new flag is introduced?
u32 supp_flags = FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG | FLOW_DIS_NEW_FLAG;
if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG))
/* handle fragment flags through lookup table */
if (mt.mask->flags & FLOW_DIS_NEW_FLAG)
/* do something */
if (!flow_rule_is_supp_control_flags(supp_flags, mt.mask->flags, extack))
return -EOPNOTSUPP;
The fragment lookup table code currently requires the above guarding, as [0][0] in the lookup table is FRAG_INVAL, and not FRAG_SHRUG.
What do you think?
Signature · 4 lines
Best regards Asbjørn Sloth Tønnesen Network Engineer Fiberby - AS42541
Daniel Machon
maintainerQuoted 29 lines
Quoted 9 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st) · line 169
Quoted 2 lines
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-1-if (mt.mask->flags) { +if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT |FLOW_DIS_FIRST_FRAG )) {Since these flags are used here and in the next patch, maybe assign them to a variable:
u32
supp_flags=FLOW_DIS_IS_FRAGMENT|FLOW_DIS_FIRST_FRAGAnd update the use throughout.
In an earlier state this patch had a #define
SPARX5_FLOWER_SUPPORTED_CTLFLAGS, in the same style as nfp indrivers/net/ethernet/netronome/nfp/flower/offload.cRight now, this driver supports all currently defined flags (which are used with mask), so the point of using
flow_rule_is_supp_control_flags()to this dirver, is to make it possible to introduce new flags in the future, without having to update all drivers to explicitly not support a new flag.My problem with using
supp_flagsin both places is: What happens when support for a new flag is introduced?u32
supp_flags=FLOW_DIS_IS_FRAGMENT|FLOW_DIS_FIRST_FRAG|FLOW_DIS_NEW_FLAG;if (
mt.mask->flags& (FLOW_DIS_IS_FRAGMENT|FLOW_DIS_FIRST_FRAG))/* handle fragment flags through lookup table */if (
mt.mask->flags&FLOW_DIS_NEW_FLAG)/* do something */
Quoted 7 lines
if (!flow_rule_is_supp_control_flags(supp_flags,
mt.mask->flags, extack))return -EOPNOTSUPP;The fragment lookup table code currently requires the above guarding, as [0][0] in the lookup table is
FRAG_INVAL, and notFRAG_SHRUG.What do you think?
Yes - lets only check for fragment flags when doing the lookup. I am fine with your original impl.
If you can fix the remaining issue, I will take the patches for a test spin tomorrow.
Thanks!
Quoted 6 lines
--
Best regards
Asbjørn Sloth Tønnesen
Network Engineer
Fiberby - AS42541
Quoted 6 lines · Tue, Apr 23, 2024 at 12:27:26PM CEST, [email protected] wrote:
Define extack locally, to reduce line lengths and future users.
Only perform fragment handling, when at least one fragment flag is set.
Remove goto, as it's only used once, and the error message is specific to that context.
3 changes, 3 patches?
Quoted 54 lines
Only compile tested.
Signed-off-by Asbjørn Sloth Tønnesen <[email protected]>---
.../ethernet/microchip/sparx5/sparx5_tc_flower.c| 13 ++++++-------1 file changed, 6 insertions(+), 7 deletions(-)drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +0
-0@@ -159,13 +159,14 @@ sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st)static int
sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st){drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-0+struct netlink_ext_ack *extack = st->fco->common.extack;struct flow_match_control mt; u32 value, mask; int err = 0; flow_rule_match_control(st->frule, &mt);drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +1
-1-if (mt.mask->flags) { +if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT |FLOW_DIS_FIRST_FRAG )) {u8 is_frag_key = !!(mt.key->flags & FLOW_DIS_IS_FRAGMENT); u8 is_frag_mask = !!(mt.mask->flags & FLOW_DIS_IS_FRAGMENT); u8 is_frag_idx = (is_frag_key << 1) | is_frag_mask;drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +4
-6@@ -190,17 +191,15 @@ sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) err =vcap_rule_add_key_u32 (st->vrule,VCAP_KF_L3_FRAGMENT_TYPE , value, mask); -if (err) - goto out; +if (err) { +NL_SET_ERR_MSG_MOD (extack,"ip_frag parse error" ); +return err; + } } st->used_keys |=BIT_ULL (FLOW_DISSECTOR_KEY_CONTROL );return err; - -out: -NL_SET_ERR_MSG_MOD (st->fco->common.extack,"ip_frag parse error" ); -return err; }static int
Signature · 1 line
2.43.0