net: flow_offload: provision conntrack info in ct_metadata

In order to offload connections in other states besides "established" the
driver offload callbacks need to have access to connection conntrack info.
Flow offload intermediate representation data structure already contains
that data encoded in 'cookie' field, so just reuse it in the drivers.

Reject offloading IP_CT_NEW connections for now by returning an error in
relevant driver callbacks based on value of ctinfo. Support for offloading
such connections will need to be added to the drivers afterwards.

Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
index 313df82..193562c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -1073,12 +1073,16 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft,
        struct mlx5_tc_ct_priv *ct_priv = ft->ct_priv;
        struct flow_action_entry *meta_action;
        unsigned long cookie = flow->cookie;
+       enum ip_conntrack_info ctinfo;
        struct mlx5_ct_entry *entry;
        int err;
 
        meta_action = mlx5_tc_ct_get_ct_metadata_action(flow_rule);
        if (!meta_action)
                return -EOPNOTSUPP;
+       ctinfo = meta_action->ct_metadata.cookie & NFCT_INFOMASK;
+       if (ctinfo == IP_CT_NEW)
+               return -EOPNOTSUPP;
 
        spin_lock_bh(&ct_priv->ht_lock);
        entry = rhashtable_lookup_fast(&ft->ct_entries_ht, &cookie, cts_ht_params);

diff --git a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
index f693119..d23830b 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
@@ -1964,6 +1964,27 @@ int nfp_fl_ct_stats(struct flow_cls_offload *flow,
        return 0;
 }
 
+static bool
+nfp_fl_ct_offload_nft_supported(struct flow_cls_offload *flow)
+{
+       struct flow_rule *flow_rule = flow->rule;
+       struct flow_action *flow_action =
+               &flow_rule->action;
+       struct flow_action_entry *act;
+       int i;
+
+       flow_action_for_each(i, act, flow_action) {
+               if (act->id == FLOW_ACTION_CT_METADATA) {
+                       enum ip_conntrack_info ctinfo =
+                               act->ct_metadata.cookie & NFCT_INFOMASK;
+
+                       return ctinfo != IP_CT_NEW;
+               }
+       }
+
+       return false;
+}
+
 static int
 nfp_fl_ct_offload_nft_flow(struct nfp_fl_ct_zone_entry *zt, struct flow_cls_offload *flow)
 {
@@ -1976,6 +1997,9 @@ nfp_fl_ct_offload_nft_flow(struct nfp_fl_ct_zone_entry *zt, struct flow_cls_offl
        extack = flow->common.extack;
        switch (flow->command) {
        case FLOW_CLS_REPLACE:
+               if (!nfp_fl_ct_offload_nft_supported(flow))
+                       return -EOPNOTSUPP;
+
                /* Netfilter can request offload multiple times for the same
                 * flow - protect against adding duplicates.
                 */