Merge branch 'nfp-flower-fixes-and-typo-in-ethtool-stats-name'

Jakub Kicinski says:

====================
nfp: flower fixes and typo in ethtool stats name

This set comes from the flower offload team.  From Pieter we have a fix
to the semantics of the flag telling FW whether to allocate or free
a mask and correction of a typo in name of one of the MAC statistics
(reveive -> received, we use past participle to match HW docs).

Dirk fixes propagation of max MTU to representors.

John improves VXLAN offload.  The old code was not using egress_dev at
all, so Jiri missed it in his conversion.  The validation of ingress
port is still not perfect, we will have to wait for shared block dust
to settle to tackle it.  This is how John explains the cases:

The following example rule is now correctly offloaded in net-next kernel:

tc filter add dev vxlan0 ... enc_dst_port 4789 ... skip_sw \
  action redirect dev nfp_p0

The following rule will not be offloaded to the NFP (previously it
incorrectly matched vxlan packets - it shouldn't as ingress dev is not
a vxlan netdev):

tc filter add dev nfp_p0 ... enc_dst_port 4789 ... skip_sw \
  action redirect dev nfp_p0

Rules that are not matching on tunnels and are an egress offload are
rejected. The standard match code assumes the offloaded repr is the
ingress port. Rejecting egress offloads removes the chances of false
interpretation of the rules on the NFP.

A know issue is that the following rule example could still be offloaded
and incorrectly match tunnel data:

tc filter add dev dummy ... enc_dst_port 4789 ... skip_sw \
  action redirect dev nfp_p0

Because the egress register callback does not give information on the
ingress netdev, the patch assumes that if it is not a repr then it is
the correct tunnel netdev. This may not be the case. The chances of this
happening is reduced as it is enforced that the rule match on the well
known vxlan port but it is still possible.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 88 insertions, 13 deletions

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index e0283bb24f06..8fcc90c0d2d3 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -125,6 +125,21 @@ nfp_flower_repr_netdev_stop(struct nfp_app *app, struct nfp_repr *repr)
         return nfp_flower_cmsg_portmod(repr, false);
 }
 
+static int
+nfp_flower_repr_netdev_init(struct nfp_app *app, struct net_device *netdev)
+{
+        return tc_setup_cb_egdev_register(netdev,
+                                          nfp_flower_setup_tc_egress_cb,
+                                          netdev_priv(netdev));
+}
+
+static void
+nfp_flower_repr_netdev_clean(struct nfp_app *app, struct net_device *netdev)
+{
+        tc_setup_cb_egdev_unregister(netdev, nfp_flower_setup_tc_egress_cb,
+                                     netdev_priv(netdev));
+}
+
 static void nfp_flower_sriov_disable(struct nfp_app *app)
 {
         struct nfp_flower_priv *priv = app->priv;
@@ -452,6 +467,9 @@ const struct nfp_app_type app_flower = {
         .vnic_init      = nfp_flower_vnic_init,
         .vnic_clean     = nfp_flower_vnic_clean,
 
+        .repr_init      = nfp_flower_repr_netdev_init,
+        .repr_clean     = nfp_flower_repr_netdev_clean,
+
         .repr_open      = nfp_flower_repr_netdev_open,
         .repr_stop      = nfp_flower_repr_netdev_stop,
 
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index c90e72b7ff5a..e6b26c5ae6e0 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -52,8 +52,7 @@ struct nfp_app;
 #define NFP_FLOWER_MASK_ELEMENT_RS      1
 #define NFP_FLOWER_MASK_HASH_BITS       10
 
-#define NFP_FL_META_FLAG_NEW_MASK       128
-#define NFP_FL_META_FLAG_LAST_MASK      1
+#define NFP_FL_META_FLAG_MANAGE_MASK    BIT(7)
 
 #define NFP_FL_MASK_REUSE_TIME_NS       40000
 #define NFP_FL_MASK_ID_LOCATION         1
@@ -197,5 +196,7 @@ void nfp_tunnel_del_ipv4_off(struct nfp_app *app, __be32 ipv4);
 void nfp_tunnel_add_ipv4_off(struct nfp_app *app, __be32 ipv4);
 void nfp_tunnel_request_route(struct nfp_app *app, struct sk_buff *skb);
 void nfp_tunnel_keep_alive(struct nfp_app *app, struct sk_buff *skb);
+int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data,
+                                  void *cb_priv);
 
 #endif
diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
index 193520ef23f0..db977cf8e933 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
@@ -282,7 +282,7 @@ nfp_check_mask_add(struct nfp_app *app, char *mask_data, u32 mask_len,
                 id = nfp_add_mask_table(app, mask_data, mask_len);
                 if (id < 0)
                         return false;
-                *meta_flags |= NFP_FL_META_FLAG_NEW_MASK;
+                *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK;
         }
         *mask_id = id;
 
@@ -299,6 +299,9 @@ nfp_check_mask_remove(struct nfp_app *app, char *mask_data, u32 mask_len,
         if (!mask_entry)
                 return false;
 
+        if (meta_flags)
+                *meta_flags &= ~NFP_FL_META_FLAG_MANAGE_MASK;
+
         *mask_id = mask_entry->mask_id;
         mask_entry->ref_cnt--;
         if (!mask_entry->ref_cnt) {
@@ -306,7 +309,7 @@ nfp_check_mask_remove(struct nfp_app *app, char *mask_data, u32 mask_len,
                 nfp_release_mask_id(app, *mask_id);
                 kfree(mask_entry);
                 if (meta_flags)
-                        *meta_flags |= NFP_FL_META_FLAG_LAST_MASK;
+                        *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK;
         }
 
         return true;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index cdbb5464b790..f5d73b83dcc2 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -131,7 +131,8 @@ static bool nfp_flower_check_higher_than_mac(struct tc_cls_flower_offload *f)
 
 static int
 nfp_flower_calculate_key_layers(struct nfp_fl_key_ls *ret_key_ls,
-                                struct tc_cls_flower_offload *flow)
+                                struct tc_cls_flower_offload *flow,
+                                bool egress)
 {
         struct flow_dissector_key_basic *mask_basic = NULL;
         struct flow_dissector_key_basic *key_basic = NULL;
@@ -167,6 +168,9 @@ nfp_flower_calculate_key_layers(struct nfp_fl_key_ls *ret_key_ls,
                         skb_flow_dissector_target(flow->dissector,
                                                   FLOW_DISSECTOR_KEY_ENC_CONTROL,
                                                   flow->key);
+                if (!egress)
+                        return -EOPNOTSUPP;
+
                 if (mask_enc_ctl->addr_type != 0xffff ||
                     enc_ctl->addr_type != FLOW_DISSECTOR_KEY_IPV4_ADDRS)
                         return -EOPNOTSUPP;
@@ -194,6 +198,9 @@ nfp_flower_calculate_key_layers(struct nfp_fl_key_ls *ret_key_ls,
 
                 key_layer |= NFP_FLOWER_LAYER_VXLAN;
                 key_size += sizeof(struct nfp_flower_vxlan);
+        } else if (egress) {
+                /* Reject non tunnel matches offloaded to egress repr. */
+                return -EOPNOTSUPP;
         }
 
         if (dissector_uses_key(flow->dissector, FLOW_DISSECTOR_KEY_BASIC)) {
@@ -315,7 +322,7 @@ err_free_flow:
  */
 static int
 nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
-                       struct tc_cls_flower_offload *flow)
+                       struct tc_cls_flower_offload *flow, bool egress)
 {
         struct nfp_flower_priv *priv = app->priv;
         struct nfp_fl_payload *flow_pay;
@@ -326,7 +333,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
         if (!key_layer)
                 return -ENOMEM;
 
-        err = nfp_flower_calculate_key_layers(key_layer, flow);
+        err = nfp_flower_calculate_key_layers(key_layer, flow, egress);
         if (err)
                 goto err_free_key_ls;
 
@@ -447,7 +454,7 @@ nfp_flower_get_stats(struct nfp_app *app, struct tc_cls_flower_offload *flow)
 
 static int