| Message ID | 20240609173358.193178-5-ast@fiberby.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 34cdd984782039c924b0476893202b37f6e74742 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: flower: validate encapsulation control flags | expand |
On Sun, Jun 09, 2024 at 05:33:54PM +0000, Asbjørn Sloth Tønnesen wrote: > Encapsulation control flags are currently not used anywhere, > so all flags are currently unsupported by all drivers. > > This patch adds validation of this assumption, so that > encapsulation flags may be used in the future. > > In case any encapsulation control flags are masked, > flow_rule_match_has_enc_control_flags() sets a NL extended > error message, and we return -EOPNOTSUPP. > > Only compile tested. > > Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net> Looks fair to me, thanks. Signed-off-by: Louis Peens <louis.peens@corigine.com> > --- > drivers/net/ethernet/netronome/nfp/flower/offload.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c > index 8e0a890381b60..46ffc2c208930 100644 > --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c > +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c > @@ -321,6 +321,10 @@ nfp_flower_calculate_key_layers(struct nfp_app *app, > > flow_rule_match_enc_control(rule, &enc_ctl); > > + if (flow_rule_has_enc_control_flags(enc_ctl.mask->flags, > + extack)) > + return -EOPNOTSUPP; > + > if (enc_ctl.mask->addr_type != 0xffff) { > NL_SET_ERR_MSG_MOD(extack, "unsupported offload: wildcarded protocols on tunnels are not supported"); > return -EOPNOTSUPP; > -- > 2.45.1 >
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c index 8e0a890381b60..46ffc2c208930 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c @@ -321,6 +321,10 @@ nfp_flower_calculate_key_layers(struct nfp_app *app, flow_rule_match_enc_control(rule, &enc_ctl); + if (flow_rule_has_enc_control_flags(enc_ctl.mask->flags, + extack)) + return -EOPNOTSUPP; + if (enc_ctl.mask->addr_type != 0xffff) { NL_SET_ERR_MSG_MOD(extack, "unsupported offload: wildcarded protocols on tunnels are not supported"); return -EOPNOTSUPP;
Encapsulation control flags are currently not used anywhere, so all flags are currently unsupported by all drivers. This patch adds validation of this assumption, so that encapsulation flags may be used in the future. In case any encapsulation control flags are masked, flow_rule_match_has_enc_control_flags() sets a NL extended error message, and we return -EOPNOTSUPP. Only compile tested. Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net> --- drivers/net/ethernet/netronome/nfp/flower/offload.c | 4 ++++ 1 file changed, 4 insertions(+)