| Message ID | 20240403-mirror-redirect-actions-v1-2-c8e7c8132c89@microchip.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add support for flower actions mirred and redirect | expand |
The 04/03/2024 20:41, Daniel Machon wrote: Hi Daniel, ... > +static int sparx5_tc_action_mirred(struct vcap_admin *admin, > + struct vcap_rule *vrule, > + struct flow_cls_offload *fco, > + struct flow_action_entry *act) > +{ > + struct vcap_u72_action ports = {0}; Maybe this is just a preferences, but usually we use memset instead of {0}; > + int err; > + > + if (admin->vtype != VCAP_TYPE_IS0 && admin->vtype != VCAP_TYPE_IS2) { > + NL_SET_ERR_MSG_MOD(fco->common.extack, > + "Mirror action not supported in this VCAP"); > + return -EOPNOTSUPP; > + } > + > + err = vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE, > + SPX5_PMM_OR_DSTMASK); > + if (err) > + return err; > + > + sparx5_tc_flower_set_port_mask(&ports, act->dev); > + > + err = vcap_rule_add_action_u72(vrule, VCAP_AF_PORT_MASK, &ports); > + if (err) > + return err; You can just return directly the return value from vcap_rule_add_action_u72 Something like: return vcap_rule_add_action_u72(...) > + > + return 0; > +} > -- > 2.34.1 >
> The 04/03/2024 20:41, Daniel Machon wrote: > > Hi Daniel, > > ... > > > +static int sparx5_tc_action_mirred(struct vcap_admin *admin, > > + struct vcap_rule *vrule, > > + struct flow_cls_offload *fco, > > + struct flow_action_entry *act) > > +{ > > + struct vcap_u72_action ports = {0}; > > Maybe this is just a preferences, but usually we use memset instead of {0}; Yes, I think this falls under preference. I'd like to keep this one as is. > > > + int err; > > + > > + if (admin->vtype != VCAP_TYPE_IS0 && admin->vtype != VCAP_TYPE_IS2) { > > + NL_SET_ERR_MSG_MOD(fco->common.extack, > > + "Mirror action not supported in this VCAP"); > > + return -EOPNOTSUPP; > > + } > > + > > + err = vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE, > > + SPX5_PMM_OR_DSTMASK); > > + if (err) > > + return err; > > + > > + sparx5_tc_flower_set_port_mask(&ports, act->dev); > > + > > + err = vcap_rule_add_action_u72(vrule, VCAP_AF_PORT_MASK, &ports); > > + if (err) > > + return err; > > You can just return directly the return value from vcap_rule_add_action_u72 > Something like: > > return vcap_rule_add_action_u72(...) > Yes, seems like a reasonable change :-) I need to respin anyway, since NIPA is complaining about something I didn't catch in my local run. Will incorporate changes in v2 - thanks. > > + > > + return 0; > > +} > > -- > > 2.34.1 > > > > -- > /Horatiu
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c index 523e0c470894..a86ce1f8f3e5 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c @@ -1004,6 +1004,44 @@ static int sparx5_tc_action_vlan_push(struct vcap_admin *admin, return err; } +static void sparx5_tc_flower_set_port_mask(struct vcap_u72_action *ports, + struct net_device *ndev) +{ + struct sparx5_port *port = netdev_priv(ndev); + int byidx = port->portno / BITS_PER_BYTE; + int biidx = port->portno % BITS_PER_BYTE; + + ports->value[byidx] |= BIT(biidx); +} + +static int sparx5_tc_action_mirred(struct vcap_admin *admin, + struct vcap_rule *vrule, + struct flow_cls_offload *fco, + struct flow_action_entry *act) +{ + struct vcap_u72_action ports = {0}; + int err; + + if (admin->vtype != VCAP_TYPE_IS0 && admin->vtype != VCAP_TYPE_IS2) { + NL_SET_ERR_MSG_MOD(fco->common.extack, + "Mirror action not supported in this VCAP"); + return -EOPNOTSUPP; + } + + err = vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE, + SPX5_PMM_OR_DSTMASK); + if (err) + return err; + + sparx5_tc_flower_set_port_mask(&ports, act->dev); + + err = vcap_rule_add_action_u72(vrule, VCAP_AF_PORT_MASK, &ports); + if (err) + return err; + + return 0; +} + /* Remove rule keys that may prevent templates from matching a keyset */ static void sparx5_tc_flower_simplify_rule(struct vcap_admin *admin, struct vcap_rule *vrule, @@ -1150,6 +1188,11 @@ static int sparx5_tc_flower_replace(struct net_device *ndev, if (err) goto out; break; + case FLOW_ACTION_MIRRED: + err = sparx5_tc_action_mirred(admin, vrule, fco, act); + if (err) + goto out; + break; case FLOW_ACTION_ACCEPT: err = sparx5_tc_set_actionset(admin, vrule); if (err)
Add support for tc flower mirred action. Two VCAP actions are encoded in the rule - one for the port mask, and one for the port mask mode. When the rule is hit, the destination mask is OR'ed with the port mask. Also add helper to set port forwarding mask. Signed-off-by: Daniel Machon <daniel.machon@microchip.com> --- .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+)