net: sparx5: add support for tc flower mirred action.

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 new VCAP function for supporting 72-bit wide actions, and a tc
helper for setting the port forwarding mask.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
index 523e0c470894f7fdcf8a995fb821ff146f08fcd9..fb2e3004183a55128b268b6d2ae19f0f9f40bb7e 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
@@ -1004,6 +1004,40 @@ 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);
+
+       return vcap_rule_add_action_u72(vrule, VCAP_AF_PORT_MASK, &ports);
+}
+
 /* 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 +1184,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)

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api.c b/drivers/net/ethernet/microchip/vcap/vcap_api.c
index ef980e4e5bc2fa22fce9a064116a3393b50df107..80ae5e1708a656c246c7e7431277914cb132f67b 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api.c
@@ -2907,6 +2907,18 @@ int vcap_rule_add_action_u32(struct vcap_rule *rule,
 }
 EXPORT_SYMBOL_GPL(vcap_rule_add_action_u32);
 
+/* Add a 72 bit action field with value to the rule */
+int vcap_rule_add_action_u72(struct vcap_rule *rule,
+                            enum vcap_action_field action,
+                            struct vcap_u72_action *fieldval)
+{
+       struct vcap_client_actionfield_data data;
+
+       memcpy(&data.u72, fieldval, sizeof(data.u72));
+       return vcap_rule_add_action(rule, action, VCAP_FIELD_U72, &data);
+}
+EXPORT_SYMBOL_GPL(vcap_rule_add_action_u72);
+
 static int vcap_read_counter(struct vcap_rule_internal *ri,
                             struct vcap_counter *ctr)
 {

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_client.h b/drivers/net/ethernet/microchip/vcap/vcap_api_client.h
index 88641508f885ed5a8ee4e8bca2f843675e7c7e6f..56874f2adbba52a7bb3a7c2da2dfbf18a130abde 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_client.h
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_client.h
@@ -200,6 +200,8 @@ int vcap_rule_add_action_bit(struct vcap_rule *rule,
                             enum vcap_action_field action, enum vcap_bit val);
 int vcap_rule_add_action_u32(struct vcap_rule *rule,
                             enum vcap_action_field action, u32 value);
+int vcap_rule_add_action_u72(struct vcap_rule *rule, enum vcap_action_field action,
+                            struct vcap_u72_action *fieldval);
 
 /* Get number of rules in a vcap instance lookup chain id range */
 int vcap_admin_rule_count(struct vcap_admin *admin, int cid);