nfp: flower: remove TC egdev offloads

Previously, only tunnel decap rules required egdev registration for
offload in NFP. These are now supported via indirect TC block callbacks.

Remove the egdev code from NFP.

Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index d1c3c20..5059110 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -146,23 +146,12 @@ nfp_flower_repr_netdev_stop(struct nfp_app *app, struct nfp_repr *repr)
        return nfp_flower_cmsg_portmod(repr, false, repr->netdev->mtu, 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)
 {
        struct nfp_repr *repr = netdev_priv(netdev);
 
        kfree(repr->app_priv);
-
-       tc_setup_cb_egdev_unregister(netdev, nfp_flower_setup_tc_egress_cb,
-                                    netdev_priv(netdev));
 }
 
 static void
@@ -711,7 +700,6 @@ 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_preclean  = nfp_flower_repr_netdev_preclean,
        .repr_clean     = nfp_flower_repr_netdev_clean,
 

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index 8c84829..9d134aa 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -207,7 +207,6 @@ struct nfp_fl_payload {
        char *unmasked_data;
        char *mask_data;
        char *action_data;
-       bool ingress_offload;
 };
 
 extern const struct rhashtable_params nfp_flower_table_params;
@@ -259,8 +258,6 @@ 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);
 void nfp_flower_lag_init(struct nfp_fl_lag *lag);
 void nfp_flower_lag_cleanup(struct nfp_fl_lag *lag);
 int nfp_flower_lag_reset(struct nfp_fl_lag *lag);

diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
index 48729bf..9b4711c 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
@@ -287,6 +287,7 @@ int nfp_compile_flow_metadata(struct nfp_app *app,
 
        nfp_flow->meta.host_ctx_id = cpu_to_be32(stats_cxt);
        nfp_flow->meta.host_cookie = cpu_to_be64(flow->cookie);
+       nfp_flow->ingress_dev = netdev;
 
        new_mask_id = 0;
        if (!nfp_check_mask_add(app, nfp_flow->mask_data,

diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index 222e1a9..0e2dfbb 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -131,7 +131,6 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
                                struct net_device *netdev,
                                struct nfp_fl_key_ls *ret_key_ls,
                                struct tc_cls_flower_offload *flow,
-                               bool egress,
                                enum nfp_flower_tun_type *tun_type)
 {
        struct flow_dissector_key_basic *mask_basic = NULL;
@@ -253,9 +252,6 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
                /* Ensure the ingress netdev matches the expected tun type. */
                if (!nfp_fl_netdev_is_tunnel_type(netdev, *tun_type))
                        return -EOPNOTSUPP;
-       } else if (egress) {
-               /* Reject non tunnel matches offloaded to egress repr. */
-               return -EOPNOTSUPP;
        }
 
        if (dissector_uses_key(flow->dissector, FLOW_DISSECTOR_KEY_BASIC)) {
@@ -376,7 +372,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
 }
 
 static struct nfp_fl_payload *
-nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer, bool egress)
+nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer)
 {
        struct nfp_fl_payload *flow_pay;
 
@@ -400,7 +396,6 @@ nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer, bool egress)
 
        flow_pay->nfp_tun_ipv4_addr = 0;
        flow_pay->meta.flags = 0;
-       flow_pay->ingress_offload = !egress;
 
        return flow_pay;
 
@@ -418,7 +413,6 @@ err_free_flow:
  * @app:       Pointer to the APP handle
  * @netdev:    netdev structure.
  * @flow:      TC flower classifier offload structure.
- * @egress:    NFP netdev is the egress.
  *
  * Adds a new flow to the repeated hash structure and action payload.
  *
@@ -426,47 +420,33 @@ err_free_flow:
  */
 static int
 nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
-                      struct tc_cls_flower_offload *flow, bool egress)
+                      struct tc_cls_flower_offload *flow)
 {
        enum nfp_flower_tun_type tun_type = NFP_FL_TUNNEL_NONE;
        struct nfp_flower_priv *priv = app->priv;
        struct nfp_fl_payload *flow_pay;
        struct nfp_fl_key_ls *key_layer;
        struct nfp_port *port = NULL;
-       struct net_device *ingr_dev;
        int err;
 
        if (nfp_netdev_is_nfp_repr(netdev))
                port = nfp_port_from_netdev(netdev);
 
-       ingr_dev = egress ? NULL : netdev;
-       flow_pay = nfp_flower_search_fl_table(app, flow->cookie, ingr_dev,
-                                             NFP_FL_STATS_CTX_DONT_CARE);
-       if (flow_pay) {
-               /* Ignore as duplicate if it has been added by different cb. */
-               if (flow_pay->ingress_offload && egress)
-                       return 0;
-               else
-                       return -EOPNOTSUPP;
-       }
-
        key_layer = kmalloc(sizeof(*key_layer), GFP_KERNEL);
        if (!key_layer)
                return -ENOMEM;
 
        err = nfp_flower_calculate_key_layers(app, netdev, key_layer, flow,
-                                             egress, &tun_type);
+                                             &tun_type);
        if (err)
                goto err_free_key_ls;
 
-       flow_pay = nfp_flower_allocate_new(key_layer, egress);
+       flow_pay = nfp_flower_allocate_new(key_layer);
        if (!flow_pay) {
                err = -ENOMEM;
                goto err_free_key_ls;
        }
 
-       flow_pay->ingress_dev = egress ? NULL : netdev;
-
        err = nfp_flower_compile_flow_match(app, flow, key_layer, netdev,
                                            flow_pay, tun_type);
        if (err)
@@ -476,8 +456,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
        if (err)
                goto err_destroy_flow;
 
-       err = nfp_compile_flow_metadata(app, flow, flow_pay,
-                                       flow_pay->ingress_dev);
+       err = nfp_compile_flow_metadata(app, flow, flow_pay, netdev);
        if (err)
                goto err_destroy_flow;
 
@@ -515,7 +494,6 @@ err_free_key_ls:
  * @app:       Pointer to the APP handle
  * @netdev:    netdev structure.
  * @flow:      TC flower classifier offload structure
- * @egress:    Netdev is the egress dev.
  *
  * Removes a flow from the repeated hash structure and clears the
  * action payload.
@@ -524,22 +502,20 @@ err_free_key_ls:
  */
 static int
 nfp_flower_del_offload(struct nfp_app *app, struct net_device *netdev,
-                      struct tc_cls_flower_offload *flow, bool egress)
+                      struct tc_cls_flower_offload *flow)
 {
        struct nfp_flower_priv *priv = app->priv;
        struct nfp_fl_payload *nfp_flow;
        struct nfp_port *port = NULL;
-       struct net_device *ingr_dev;
        int err;
 
        if (nfp_netdev_is_nfp_repr(netdev))
                port = nfp_port_from_netdev(netdev);
 
-       ingr_dev = egress ? NULL : netdev;
-       nfp_flow = nfp_flower_search_fl_table(app, flow->cookie, ingr_dev,
+       nfp_flow = nfp_flower_search_fl_table(app, flow->cookie, netdev,
                                              NFP_FL_STATS_CTX_DONT_CARE);
        if (!nfp_flow)
-               return egress ? 0 : -ENOENT;
+               return -ENOENT;
 
        err = nfp_modify_flow_metadata(app, nfp_flow);
        if (err)
@@ -571,7 +547,6 @@ err_free_flow:
  * @app:       Pointer to the APP handle
  * @netdev:    Netdev structure.
  * @flow:      TC flower classifier offload structure
- * @egress:    Netdev is the egress dev.
  *
  * Populates a flow statistics structure which which corresponds to a
  * specific flow.
@@ -580,22 +555,17 @@ err_free_flow:
  */
 static int
 nfp_flower_get_stats(struct nfp_app *app, struct net_device *netdev,
-                    struct tc_cls_flower_offload *flow, bool egress)
+                    struct tc_cls_flower_offload *flow)
 {
        struct nfp_flower_priv *priv = app->priv;
        struct nfp_fl_payload *nfp_flow;
-       struct net_device *ingr_dev;
        u32 ctx_id;
 
-       ingr_dev = egress ? NULL : netdev;
-       nfp_flow = nfp_flower_search_fl_table(app, flow->cookie, ingr_dev,
+       nfp_flow = nfp_flower_search_fl_table(app, flow->cookie, netdev,
                                              NFP_FL_STATS_CTX_DONT_CARE);
        if (!nfp_flow)
                return -EINVAL;
 
-       if (nfp_flow->ingress_offload && egress)
-               return 0;
-
        ctx_id = be32_to_cpu(nfp_flow->meta.host_ctx_id);
 
        spin_lock_bh(&priv->stats_lock);
@@ -612,35 +582,18 @@ nfp_flower_get_stats(struct nfp_app *app, struct net_device *netdev,
 
 static int
 nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,
-                       struct tc_cls_flower_offload *flower, bool egress)
+                       struct tc_cls_flower_offload *flower)
 {
        if (!eth_proto_is_802_3(flower->common.protocol))
                return -EOPNOTSUPP;
 
        switch (flower->command) {
        case TC_CLSFLOWER_REPLACE:
-               return nfp_flower_add_offload(app, netdev, flower, egress);
+               return nfp_flower_add_offload(app, netdev, flower);
        case TC_CLSFLOWER_DESTROY:
-               return nfp_flower_del_offload(app, netdev, flower, egress);
+               return nfp_flower_del_offload(app, netdev, flower);
        case TC_CLSFLOWER_STATS:
-               return nfp_flower_get_stats(app, netdev, flower, egress);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data,
-                                 void *cb_priv)
-{
-       struct nfp_repr *repr = cb_priv;
-
-       if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data))
-               return -EOPNOTSUPP;
-
-       switch (type) {
-       case TC_SETUP_CLSFLOWER:
-               return nfp_flower_repr_offload(repr->app, repr->netdev,
-                                              type_data, true);
+               return nfp_flower_get_stats(app, netdev, flower);
        default:
                return -EOPNOTSUPP;
        }
@@ -657,7 +610,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,
        switch (type) {
        case TC_SETUP_CLSFLOWER:
                return nfp_flower_repr_offload(repr->app, repr->netdev,
-                                              type_data, false);
+                                              type_data);
        default:
                return -EOPNOTSUPP;
        }
@@ -732,7 +685,7 @@ static int nfp_flower_setup_indr_block_cb(enum tc_setup_type type,
        switch (type) {
        case TC_SETUP_CLSFLOWER:
                return nfp_flower_repr_offload(priv->app, priv->netdev,
-                                              type_data, false);
+                                              type_data);
        default:
                return -EOPNOTSUPP;
        }