net: microchip: vcap api: Enable/Disable rules via chains in VCAP HW

This supports that individual rules are enabled and disabled via chain
information.
This is done by keeping disabled rules in the VCAP list (cached) until they
are enabled, and only at this time are the rules written to the VCAP HW.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api.c b/drivers/net/ethernet/microchip/vcap/vcap_api.c
index 9226968d32dcad6c53a6a4f6dacc650c03c96890..0f9e0d735ae3b609451ab209d41d8f4f288c02fb 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api.c
@@ -1990,6 +1990,9 @@ static bool vcap_path_exist(struct vcap_control *vctrl, struct net_device *ndev,
        struct vcap_admin *admin;
        int tmp;
 
+       if (dst_cid == 0) /* Chain zero is always available */
+               return true;
+
        /* Find first entry that starts from chain 0*/
        list_for_each_entry(admin, &vctrl->list, list) {
                list_for_each_entry(elem, &admin->enabled, list) {
@@ -2025,8 +2028,6 @@ static void vcap_rule_set_state(struct vcap_rule_internal *ri)
                ri->state = VCAP_RS_ENABLED;
        else
                ri->state = VCAP_RS_DISABLED;
-       /* For now always store directly in HW */
-       ri->state = VCAP_RS_PERMANENT;
 }
 
 /* Encode and write a validated rule to the VCAP */
@@ -2711,6 +2712,125 @@ void vcap_set_tc_exterr(struct flow_cls_offload *fco, struct vcap_rule *vrule)
 }
 EXPORT_SYMBOL_GPL(vcap_set_tc_exterr);
 
+/* Write a rule to VCAP HW to enable it */
+static int vcap_enable_rule(struct vcap_rule_internal *ri)
+{
+       struct vcap_client_actionfield *af, *naf;
+       struct vcap_client_keyfield *kf, *nkf;
+       int err;
+
+       vcap_erase_cache(ri);
+       err = vcap_encode_rule(ri);
+       if (err)
+               goto out;
+       err = vcap_write_rule(ri);
+       if (err)
+               goto out;
+
+       /* Deallocate the list of keys and actions */
+       list_for_each_entry_safe(kf, nkf, &ri->data.keyfields, ctrl.list) {
+               list_del(&kf->ctrl.list);
+               kfree(kf);
+       }
+       list_for_each_entry_safe(af, naf, &ri->data.actionfields, ctrl.list) {
+               list_del(&af->ctrl.list);
+               kfree(af);
+       }
+       ri->state = VCAP_RS_ENABLED;
+out:
+       return err;
+}
+
+/* Enable all disabled rules for a specific chain/port in the VCAP HW */
+static int vcap_enable_rules(struct vcap_control *vctrl,
+                            struct net_device *ndev, int chain)
+{
+       struct vcap_rule_internal *ri;
+       struct vcap_admin *admin;
+       int err = 0;
+
+       list_for_each_entry(admin, &vctrl->list, list) {
+               if (!(chain >= admin->first_cid && chain <= admin->last_cid))
+                       continue;
+
+               /* Found the admin, now find the offloadable rules */
+               mutex_lock(&admin->lock);
+               list_for_each_entry(ri, &admin->rules, list) {
+                       if (ri->data.vcap_chain_id != chain)
+                               continue;
+
+                       if (ri->ndev != ndev)
+                               continue;
+
+                       if (ri->state != VCAP_RS_DISABLED)
+                               continue;
+
+                       err = vcap_enable_rule(ri);
+                       if (err)
+                               break;
+               }
+               mutex_unlock(&admin->lock);
+               if (err)
+                       break;
+       }
+       return err;
+}
+
+/* Read and erase a rule from VCAP HW to disable it */
+static int vcap_disable_rule(struct vcap_rule_internal *ri)
+{
+       int err;
+
+       err = vcap_read_rule(ri);
+       if (err)
+               return err;
+       err = vcap_decode_keyset(ri);
+       if (err)
+               return err;
+       err = vcap_decode_actionset(ri);
+       if (err)
+               return err;
+
+       ri->state = VCAP_RS_DISABLED;
+       ri->vctrl->ops->init(ri->ndev, ri->admin, ri->addr, ri->size);
+       return 0;
+}
+
+/* Disable all enabled rules for a specific chain/port in the VCAP HW */
+static int vcap_disable_rules(struct vcap_control *vctrl,
+                             struct net_device *ndev, int chain)
+{
+       struct vcap_rule_internal *ri;
+       struct vcap_admin *admin;
+       int err = 0;
+
+       list_for_each_entry(admin, &vctrl->list, list) {
+               if (!(chain >= admin->first_cid && chain <= admin->last_cid))
+                       continue;
+
+               /* Found the admin, now find the rules on the chain */
+               mutex_lock(&admin->lock);
+               list_for_each_entry(ri, &admin->rules, list) {
+                       if (ri->data.vcap_chain_id != chain)
+                               continue;
+
+                       if (ri->ndev != ndev)
+                               continue;
+
+                       if (ri->state != VCAP_RS_ENABLED)
+                               continue;
+
+                       err = vcap_disable_rule(ri);
+                       if (err)
+                               break;
+               }
+               mutex_unlock(&admin->lock);
+               if (err)
+                       break;
+       }
+       return err;
+}
+
 /* Check if this port is already enabled for this VCAP instance */
 static bool vcap_is_enabled(struct vcap_control *vctrl, struct net_device *ndev,
                            int dst_cid)
@@ -2752,6 +2872,17 @@ static int vcap_enable(struct vcap_control *vctrl, struct net_device *ndev,
        list_add_tail(&eport->list, &admin->enabled);
        mutex_unlock(&admin->lock);
 
+       if (vcap_path_exist(vctrl, ndev, src_cid)) {
+               /* Enable chained lookups */
+               while (dst_cid) {
+                       admin = vcap_find_admin(vctrl, dst_cid);
+                       if (!admin)
+                               return -ENOENT;
+
+                       vcap_enable_rules(vctrl, ndev, dst_cid);
+                       dst_cid = vcap_get_next_chain(vctrl, ndev, dst_cid);
+               }
+       }
        return 0;
 }
 
@@ -2761,6 +2892,7 @@ static int vcap_disable(struct vcap_control *vctrl, struct net_device *ndev,
 {
        struct vcap_enabled_port *elem, *eport = NULL;
        struct vcap_admin *found = NULL, *admin;
+       int dst_cid;
 
        list_for_each_entry(admin, &vctrl->list, list) {
                list_for_each_entry(elem, &admin->enabled, list) {
@@ -2777,6 +2909,17 @@ static int vcap_disable(struct vcap_control *vctrl, struct net_device *ndev,
        if (!eport)
                return -ENOENT;
 
+       /* Disable chained lookups */
+       dst_cid = eport->dst_cid;
+       while (dst_cid) {
+               admin = vcap_find_admin(vctrl, dst_cid);
+               if (!admin)
+                       return -ENOENT;
+
+               vcap_disable_rules(vctrl, ndev, dst_cid);
+               dst_cid = vcap_get_next_chain(vctrl, ndev, dst_cid);
+       }
+
        mutex_lock(&found->lock);
        list_del(&eport->list);
        mutex_unlock(&found->lock);
@@ -2903,6 +3046,65 @@ int vcap_rule_get_counter(struct vcap_rule *rule, struct vcap_counter *ctr)
 }
 EXPORT_SYMBOL_GPL(vcap_rule_get_counter);
 
+/* Get a copy of a client key field */
+static int vcap_rule_get_key(struct vcap_rule *rule,
+                            enum vcap_key_field key,
+                            struct vcap_client_keyfield *ckf)
+{
+       struct vcap_client_keyfield *field;
+
+       field = vcap_find_keyfield(rule, key);
+       if (!field)
+               return -EINVAL;
+       memcpy(ckf, field, sizeof(*ckf));
+       INIT_LIST_HEAD(&ckf->ctrl.list);
+       return 0;
+}
+
+/* Get the keysets that matches the rule key type/mask */
+int vcap_rule_get_keysets(struct vcap_rule_internal *ri,
+                         struct vcap_keyset_list *matches)
+{
+       struct vcap_control *vctrl = ri->vctrl;
+       enum vcap_type vt = ri->admin->vtype;
+       const struct vcap_set *keyfield_set;
+       struct vcap_client_keyfield kf = {};
+       u32 value, mask;
+       int err, idx;
+
+       err = vcap_rule_get_key(&ri->data, VCAP_KF_TYPE, &kf);
+       if (err)
+               return err;
+
+       if (kf.ctrl.type == VCAP_FIELD_BIT) {
+               value = kf.data.u1.value;
+               mask = kf.data.u1.mask;
+       } else if (kf.ctrl.type == VCAP_FIELD_U32) {
+               value = kf.data.u32.value;
+               mask = kf.data.u32.mask;
+       } else {
+               return -EINVAL;
+       }
+
+       keyfield_set = vctrl->vcaps[vt].keyfield_set;
+       for (idx = 0; idx < vctrl->vcaps[vt].keyfield_set_size; ++idx) {
+               if (keyfield_set[idx].sw_per_item != ri->keyset_sw)
+                       continue;
+
+               if (keyfield_set[idx].type_id == (u8)-1) {
+                       vcap_keyset_list_add(matches, idx);
+                       continue;
+               }
+
+               if ((keyfield_set[idx].type_id & mask) == value)
+                       vcap_keyset_list_add(matches, idx);
+       }
+       if (matches->cnt > 0)
+               return 0;
+
+       return -EINVAL;
+}
+
 static int vcap_rule_mod_key(struct vcap_rule *rule,
                             enum vcap_key_field key,
                             enum vcap_field_type ftype,

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_client.h b/drivers/net/ethernet/microchip/vcap/vcap_api_client.h
index f442284360515e471133537978b7c274af3a5d05..b8980b22352fdcd38a5fa9363ec8586559d8f33c 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_client.h
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_client.h
@@ -264,5 +264,4 @@ int vcap_rule_mod_action_u32(struct vcap_rule *rule,
 /* Get a 32 bit key field value and mask from the rule */
 int vcap_rule_get_key_u32(struct vcap_rule *rule, enum vcap_key_field key,
                          u32 *value, u32 *mask);
-
 #endif /* __VCAP_API_CLIENT__ */

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c b/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
index d6a09ce75e4f60e6d51018002ef045785545d19f..dc06f6d4f513f49ca09306f6141f6e507aec742b 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
@@ -164,10 +164,13 @@ static int vcap_debugfs_show_keysets(struct vcap_rule_internal *ri,
        matches.cnt = 0;
        matches.max = ARRAY_SIZE(keysets);
 
-       err = vcap_find_keystream_keysets(ri->vctrl, admin->vtype,
-                                         admin->cache.keystream,
-                                         admin->cache.maskstream,
-                                         false, 0, &matches);
+       if (ri->state == VCAP_RS_DISABLED)
+               err = vcap_rule_get_keysets(ri, &matches);
+       else
+               err = vcap_find_keystream_keysets(ri->vctrl, admin->vtype,
+                                                 admin->cache.keystream,
+                                                 admin->cache.maskstream,
+                                                 false, 0, &matches);
        if (err) {
                pr_err("%s:%d: could not find valid keysets: %d\n",
                       __func__, __LINE__, err);

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
index fdef9102a9b32441bc3d32e96cf4c6ad0c3b4c2d..22690c669028a05d7b1befd433be36646733d08f 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
@@ -1305,8 +1305,8 @@ static void vcap_api_encode_rule_test(struct kunit *test)
 
        struct vcap_admin is2_admin = {
                .vtype = VCAP_TYPE_IS2,
-               .first_cid = 10000,
-               .last_cid = 19999,
+               .first_cid = 8000000,
+               .last_cid = 8099999,
                .lookups = 4,
                .last_valid_addr = 3071,
                .first_valid_addr = 0,
@@ -1319,7 +1319,7 @@ static void vcap_api_encode_rule_test(struct kunit *test)
        };
        struct vcap_rule *rule;
        struct vcap_rule_internal *ri;
-       int vcap_chain_id = 10005;
+       int vcap_chain_id = 8000000;
        enum vcap_user user = VCAP_USER_VCAP_UTIL;
        u16 priority = 10;
        int id = 100;
@@ -1391,6 +1391,11 @@ static void vcap_api_encode_rule_test(struct kunit *test)
        KUNIT_EXPECT_EQ(test, 2, ri->keyset_sw_regs);
        KUNIT_EXPECT_EQ(test, 4, ri->actionset_sw_regs);
 
+       /* Enable lookup, so the rule will be written */
+       ret = vcap_enable_lookups(&test_vctrl, &test_netdev, 0,
+                                 rule->vcap_chain_id, rule->cookie, true);
+       KUNIT_EXPECT_EQ(test, 0, ret);
+
        /* Add rule with write callback */
        ret = vcap_add_rule(rule);
        KUNIT_EXPECT_EQ(test, 0, ret);

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_private.h b/drivers/net/ethernet/microchip/vcap/vcap_api_private.h
index ce35af9a853d69ac7e7cd8598abb3064a57e98ef..86542accffe6bd2fe76450bcd494f5f14fb45399 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_private.h
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_private.h
@@ -115,4 +115,7 @@ int vcap_find_keystream_keysets(struct vcap_control *vctrl, enum vcap_type vt,
                                u32 *keystream, u32 *mskstream, bool mask,
                                int sw_max, struct vcap_keyset_list *kslist);
 
+/* Get the keysets that matches the rule key type/mask */
+int vcap_rule_get_keysets(struct vcap_rule_internal *ri,
+                         struct vcap_keyset_list *matches);
 #endif /* __VCAP_API_PRIVATE__ */