net/sched: act_ct: Enable hardware offload of flow table entires

Pass the zone's flow table instance on the flow action to the drivers.
Thus, allowing drivers to register FT add/del/stats callbacks.

Finally, enable hardware offload on the flow table instance.

Signed-off-by: Paul Blakey <paulb@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index a039c900c384c3cc9d0ec1588b0d9546c1ca04ab..ceaa3628796d25ed4e05ff0cb766efd5487dc11f 100644 (file)
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -225,6 +225,7 @@ struct flow_action_entry {
                struct {                                /* FLOW_ACTION_CT */
                        int action;
                        u16 zone;
+                       struct nf_flowtable *flow_table;
                } ct;
                struct {
                        unsigned long cookie;

diff --git a/include/net/tc_act/tc_ct.h b/include/net/tc_act/tc_ct.h
index 735da5912974ab6cd30643dd9162f20f3108b6ba..79654bcb9a2952a46f10ab27745ebe1e46ed01fe 100644 (file)
--- a/include/net/tc_act/tc_ct.h
+++ b/include/net/tc_act/tc_ct.h
@@ -27,6 +27,7 @@ struct tcf_ct_params {
        struct rcu_head rcu;
 
        struct tcf_ct_flow_table *ct_ft;
+       struct nf_flowtable *nf_ft;
 };
 
 struct tcf_ct {
@@ -50,9 +51,18 @@ static inline int tcf_ct_action(const struct tc_action *a)
        return to_ct_params(a)->ct_action;
 }
 
+static inline struct nf_flowtable *tcf_ct_ft(const struct tc_action *a)
+{
+       return to_ct_params(a)->nf_ft;
+}
+
 #else
 static inline uint16_t tcf_ct_zone(const struct tc_action *a) { return 0; }
 static inline int tcf_ct_action(const struct tc_action *a) { return 0; }
+static inline struct nf_flowtable *tcf_ct_ft(const struct tc_action *a)
+{
+       return NULL;
+}
 #endif /* CONFIG_NF_CONNTRACK */
 
 #if IS_ENABLED(CONFIG_NET_ACT_CT)

diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index 16fc731e5b039bb79f5104d65cb43ececa267f2f..56b66d215a897b8c9c6a739155dfe5ea599f9136 100644 (file)
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -292,6 +292,7 @@ static int tcf_ct_flow_table_get(struct tcf_ct_params *params)
                goto err_insert;
 
        ct_ft->nf_ft.type = &flowtable_ct;
+       ct_ft->nf_ft.flags |= NF_FLOWTABLE_HW_OFFLOAD;
        err = nf_flow_table_init(&ct_ft->nf_ft);
        if (err)
                goto err_init;
@@ -299,6 +300,7 @@ static int tcf_ct_flow_table_get(struct tcf_ct_params *params)
        __module_get(THIS_MODULE);
 out_unlock:
        params->ct_ft = ct_ft;
+       params->nf_ft = &ct_ft->nf_ft;
        mutex_unlock(&zones_mutex);
 
        return 0;

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 2b5b4ebda8422f0f40281435d47342d885731c75..2046102a763efe2a2fa7f1872d4020109da194a2 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3636,6 +3636,7 @@ int tc_setup_flow_action(struct flow_action *flow_action,
                        entry->id = FLOW_ACTION_CT;
                        entry->ct.action = tcf_ct_action(act);
                        entry->ct.zone = tcf_ct_zone(act);
+                       entry->ct.flow_table = tcf_ct_ft(act);
                } else if (is_tcf_mpls(act)) {
                        switch (tcf_mpls_action(act)) {
                        case TCA_MPLS_ACT_PUSH: