2024-04-03 18:44:23

by Daniel Machon

[permalink] [raw]
Subject: [PATCH net-next 0/3] Add support for flower actions mirred and redirect

================================================================================
Add support for tc flower actions mirred and redirect.
================================================================================

This series adds support for the two tc flower actions mirred and
redirect. Both actions are implemented by means of a port mask and a
mask mode. The mask mode controls how the mask is applied, and together
they are used by the switch to make a forwarding decision. Both actions
are configurable via the IS0 or IS2 VCAP's (ingress stage 0 and 2,
respectively).

Patch #1: adds support for 72-bit actions.
Patch #2: adds support for tc flower mirred action.
Patch #3: adds support for tc flower redirect action.

Signed-off-by: Daniel Machon <[email protected]>
---
Daniel Machon (3):
net: sparx5: support 72-bit VCAP actions
net: sparx5: add support for tc flower mirred action.
net: sparx5: add support for tc flower redirect action

.../ethernet/microchip/sparx5/sparx5_tc_flower.c | 76 ++++++++++++++++++++++
drivers/net/ethernet/microchip/vcap/vcap_api.c | 12 ++++
.../net/ethernet/microchip/vcap/vcap_api_client.h | 2 +
3 files changed, 90 insertions(+)
---
base-commit: 5fc68320c1fb3c7d456ddcae0b4757326a043e6f
change-id: 20240402-mirror-redirect-actions-cc469cc58586

Best regards,
--
Daniel Machon <[email protected]>



2024-04-03 19:24:11

by Daniel Machon

[permalink] [raw]
Subject: [PATCH net-next 3/3] net: sparx5: add support for tc flower redirect action

Add support for the flower redirect 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 port mask is used as the final destination
set, replacing all other port masks.

Signed-off-by: Daniel Machon <[email protected]>
---
.../ethernet/microchip/sparx5/sparx5_tc_flower.c | 33 ++++++++++++++++++++++
1 file changed, 33 insertions(+)

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
index a86ce1f8f3e5..0df8724251a0 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
@@ -1042,6 +1042,34 @@ static int sparx5_tc_action_mirred(struct vcap_admin *admin,
return 0;
}

+static int sparx5_tc_action_redirect(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,
+ "Redirect action not supported in this VCAP");
+ return -EOPNOTSUPP;
+ }
+
+ err = vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE,
+ SPX5_PMM_REPLACE_ALL);
+ 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,
@@ -1193,6 +1221,11 @@ static int sparx5_tc_flower_replace(struct net_device *ndev,
if (err)
goto out;
break;
+ case FLOW_ACTION_REDIRECT:
+ err = sparx5_tc_action_redirect(admin, vrule, fco, act);
+ if (err)
+ goto out;
+ break;
case FLOW_ACTION_ACCEPT:
err = sparx5_tc_set_actionset(admin, vrule);
if (err)

--
2.34.1


2024-04-04 06:48:33

by Horatiu Vultur

[permalink] [raw]
Subject: Re: [PATCH net-next 3/3] net: sparx5: add support for tc flower redirect action

The 04/03/2024 20:41, Daniel Machon wrote:

Hi Daniel,


> +static int sparx5_tc_action_redirect(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;

The same comments from previous patch applies also here.

> +
> + if (admin->vtype != VCAP_TYPE_IS0 && admin->vtype != VCAP_TYPE_IS2) {
> + NL_SET_ERR_MSG_MOD(fco->common.extack,
> + "Redirect action not supported in this VCAP");
> + return -EOPNOTSUPP;
> + }
> +
> + err = vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE,
> + SPX5_PMM_REPLACE_ALL);
> + 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;
> +

And here.

> + return 0;
> +}

> --
> 2.34.1
>

--
/Horatiu