sfc: add code to register and unregister encap matches

Add a hashtable to detect duplicate and conflicting matches.  If match
 is not a duplicate, call MAE functions to add/remove it from OR table.
Calling code not added yet, so mark the new functions as unused.

Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/tc.c b/drivers/net/ethernet/sfc/tc.c
index 21eb79b..69d3ee5 100644 (file)
--- a/drivers/net/ethernet/sfc/tc.c
+++ b/drivers/net/ethernet/sfc/tc.c
@@ -57,6 +57,12 @@ static s64 efx_tc_flower_external_mport(struct efx_nic *efx, struct efx_rep *efv
        return mport;
 }
 
+static const struct rhashtable_params efx_tc_encap_match_ht_params = {
+       .key_len        = offsetof(struct efx_tc_encap_match, linkage),
+       .key_offset     = 0,
+       .head_offset    = offsetof(struct efx_tc_encap_match, linkage),
+};
+
 static const struct rhashtable_params efx_tc_match_action_ht_params = {
        .key_len        = sizeof(unsigned long),
        .key_offset     = offsetof(struct efx_tc_flow_rule, cookie),
@@ -340,6 +346,144 @@ static int efx_tc_flower_parse_match(struct efx_nic *efx,
        return 0;
 }
 
+__always_unused
+static int efx_tc_flower_record_encap_match(struct efx_nic *efx,
+                                           struct efx_tc_match *match,
+                                           enum efx_encap_type type,
+                                           struct netlink_ext_ack *extack)
+{
+       struct efx_tc_encap_match *encap, *old;
+       bool ipv6 = false;
+       int rc;
+
+       /* We require that the socket-defining fields (IP addrs and UDP dest
+        * port) are present and exact-match.  Other fields are currently not
+        * allowed.  This meets what OVS will ask for, and means that we don't
+        * need to handle difficult checks for overlapping matches as could
+        * come up if we allowed masks or varying sets of match fields.
+        */
+       if (match->mask.enc_dst_ip | match->mask.enc_src_ip) {
+               if (!IS_ALL_ONES(match->mask.enc_dst_ip)) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Egress encap match is not exact on dst IP address");
+                       return -EOPNOTSUPP;
+               }
+               if (!IS_ALL_ONES(match->mask.enc_src_ip)) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Egress encap match is not exact on src IP address");
+                       return -EOPNOTSUPP;
+               }
+#ifdef CONFIG_IPV6
+               if (!ipv6_addr_any(&match->mask.enc_dst_ip6) ||
+                   !ipv6_addr_any(&match->mask.enc_src_ip6)) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Egress encap match on both IPv4 and IPv6, don't understand");
+                       return -EOPNOTSUPP;
+               }
+       } else {
+               ipv6 = true;
+               if (!efx_ipv6_addr_all_ones(&match->mask.enc_dst_ip6)) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Egress encap match is not exact on dst IP address");
+                       return -EOPNOTSUPP;
+               }
+               if (!efx_ipv6_addr_all_ones(&match->mask.enc_src_ip6)) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Egress encap match is not exact on src IP address");
+                       return -EOPNOTSUPP;
+               }
+#endif
+       }
+       if (!IS_ALL_ONES(match->mask.enc_dport)) {
+               NL_SET_ERR_MSG_MOD(extack, "Egress encap match is not exact on dst UDP port");
+               return -EOPNOTSUPP;
+       }
+       if (match->mask.enc_sport) {
+               NL_SET_ERR_MSG_MOD(extack, "Egress encap match on src UDP port not supported");
+               return -EOPNOTSUPP;
+       }
+       if (match->mask.enc_ip_tos) {
+               NL_SET_ERR_MSG_MOD(extack, "Egress encap match on IP ToS not supported");
+               return -EOPNOTSUPP;
+       }
+       if (match->mask.enc_ip_ttl) {
+               NL_SET_ERR_MSG_MOD(extack, "Egress encap match on IP TTL not supported");
+               return -EOPNOTSUPP;
+       }
+
+       rc = efx_mae_check_encap_match_caps(efx, ipv6, extack);
+       if (rc) {
+               NL_SET_ERR_MSG_FMT_MOD(extack, "MAE hw reports no support for IPv%d encap matches",
+                                      ipv6 ? 6 : 4);
+               return -EOPNOTSUPP;
+       }
+
+       encap = kzalloc(sizeof(*encap), GFP_USER);
+       if (!encap)
+               return -ENOMEM;
+       encap->src_ip = match->value.enc_src_ip;
+       encap->dst_ip = match->value.enc_dst_ip;
+#ifdef CONFIG_IPV6
+       encap->src_ip6 = match->value.enc_src_ip6;
+       encap->dst_ip6 = match->value.enc_dst_ip6;
+#endif
+       encap->udp_dport = match->value.enc_dport;
+       encap->tun_type = type;
+       old = rhashtable_lookup_get_insert_fast(&efx->tc->encap_match_ht,
+                                               &encap->linkage,
+                                               efx_tc_encap_match_ht_params);
+       if (old) {
+               /* don't need our new entry */
+               kfree(encap);
+               if (old->tun_type != type) {
+                       NL_SET_ERR_MSG_FMT_MOD(extack,
+                                              "Egress encap match with conflicting tun_type %u != %u",
+                                              old->tun_type, type);
+                       return -EEXIST;
+               }
+               if (!refcount_inc_not_zero(&old->ref))
+                       return -EAGAIN;
+               /* existing entry found */
+               encap = old;
+       } else {
+               rc = efx_mae_register_encap_match(efx, encap);
+               if (rc) {
+                       NL_SET_ERR_MSG_MOD(extack, "Failed to record egress encap match in HW");
+                       goto fail;
+               }
+               refcount_set(&encap->ref, 1);
+       }
+       match->encap = encap;
+       return 0;
+fail:
+       rhashtable_remove_fast(&efx->tc->encap_match_ht, &encap->linkage,
+                              efx_tc_encap_match_ht_params);
+       kfree(encap);
+       return rc;
+}
+
+__always_unused
+static void efx_tc_flower_release_encap_match(struct efx_nic *efx,
+                                             struct efx_tc_encap_match *encap)
+{
+       int rc;
+
+       if (!refcount_dec_and_test(&encap->ref))
+               return; /* still in use */
+
+       rc = efx_mae_unregister_encap_match(efx, encap);
+       if (rc)
+               /* Display message but carry on and remove entry from our
+                * SW tables, because there's not much we can do about it.
+                */
+               netif_err(efx, drv, efx->net_dev,
+                         "Failed to release encap match %#x, rc %d\n",
+                         encap->fw_id, rc);
+       rhashtable_remove_fast(&efx->tc->encap_match_ht, &encap->linkage,
+                              efx_tc_encap_match_ht_params);
+       kfree(encap);
+}
+
 /* For details of action order constraints refer to SF-123102-TC-1§12.6.1 */
 enum efx_tc_action_order {
        EFX_TC_AO_VLAN_POP,
@@ -974,6 +1118,18 @@ void efx_fini_tc(struct efx_nic *efx)
        efx->tc->up = false;
 }
 
+/* At teardown time, all TC filter rules (and thus all resources they created)
+ * should already have been removed.  If we find any in our hashtables, make a
+ * cursory attempt to clean up the software side.
+ */
+static void efx_tc_encap_match_free(void *ptr, void *__unused)
+{
+       struct efx_tc_encap_match *encap = ptr;
+
+       WARN_ON(refcount_read(&encap->ref));
+       kfree(encap);
+}
+
 int efx_init_struct_tc(struct efx_nic *efx)
 {
        int rc;
@@ -996,6 +1152,9 @@ int efx_init_struct_tc(struct efx_nic *efx)
        rc = efx_tc_init_counters(efx);
        if (rc < 0)
                goto fail_counters;
+       rc = rhashtable_init(&efx->tc->encap_match_ht, &efx_tc_encap_match_ht_params);
+       if (rc < 0)
+               goto fail_encap_match_ht;
        rc = rhashtable_init(&efx->tc->match_action_ht, &efx_tc_match_action_ht_params);
        if (rc < 0)
                goto fail_match_action_ht;
@@ -1008,6 +1167,8 @@ int efx_init_struct_tc(struct efx_nic *efx)
        efx->extra_channel_type[EFX_EXTRA_CHANNEL_TC] = &efx_tc_channel_type;
        return 0;
 fail_match_action_ht:
+       rhashtable_destroy(&efx->tc->encap_match_ht);
+fail_encap_match_ht:
        efx_tc_destroy_counters(efx);
 fail_counters:
        mutex_destroy(&efx->tc->mutex);
@@ -1030,6 +1191,8 @@ void efx_fini_struct_tc(struct efx_nic *efx)
                             MC_CMD_MAE_ACTION_RULE_INSERT_OUT_ACTION_RULE_ID_NULL);
        rhashtable_free_and_destroy(&efx->tc->match_action_ht, efx_tc_flow_free,
                                    efx);
+       rhashtable_free_and_destroy(&efx->tc->encap_match_ht,
+                                   efx_tc_encap_match_free, NULL);
        efx_tc_fini_counters(efx);
        mutex_unlock(&efx->tc->mutex);
        mutex_destroy(&efx->tc->mutex);

diff --git a/drivers/net/ethernet/sfc/tc.h b/drivers/net/ethernet/sfc/tc.h
index fff7396..7d06c50 100644 (file)
--- a/drivers/net/ethernet/sfc/tc.h
+++ b/drivers/net/ethernet/sfc/tc.h
@@ -18,6 +18,13 @@
 
 #define IS_ALL_ONES(v) (!(typeof (v))~(v))
 
+#ifdef CONFIG_IPV6
+static inline bool efx_ipv6_addr_all_ones(struct in6_addr *addr)
+{
+       return !memchr_inv(addr, 0xff, sizeof(*addr));
+}
+#endif
+
 struct efx_tc_action_set {
        u16 vlan_push:2;
        u16 vlan_pop:2;
@@ -70,7 +77,9 @@ struct efx_tc_encap_match {
        __be32 src_ip, dst_ip;
        struct in6_addr src_ip6, dst_ip6;
        __be16 udp_dport;
+       struct rhash_head linkage;
        enum efx_encap_type tun_type;
+       refcount_t ref;
        u32 fw_id; /* index of this entry in firmware encap match table */
 };
 
@@ -107,6 +116,7 @@ enum efx_tc_rule_prios {
  * @mutex: Used to serialise operations on TC hashtables
  * @counter_ht: Hashtable of TC counters (FW IDs and counter values)
  * @counter_id_ht: Hashtable mapping TC counter cookies to counters
+ * @encap_match_ht: Hashtable of TC encap matches
  * @match_action_ht: Hashtable of TC match-action rules
  * @reps_mport_id: MAE port allocated for representor RX
  * @reps_filter_uc: VNIC filter for representor unicast RX (promisc)
@@ -130,6 +140,7 @@ struct efx_tc_state {
        struct mutex mutex;
        struct rhashtable counter_ht;
        struct rhashtable counter_id_ht;
+       struct rhashtable encap_match_ht;
        struct rhashtable match_action_ht;
        u32 reps_mport_id, reps_mport_vport_id;
        s32 reps_filter_uc, reps_filter_mc;