nfp: flower: refactor function "is_post_ct_flow"

'ct_clear' action only or no ct action is supported for 'post_ct_flow'.
But in scenario of multiple ct zones, one non 'ct_clear' ct action or
more ct actions, including 'ct_clear action', may be present in one flow
rule. If ct state match key is 'ct_established', the flow rule is still
expected to be classified as 'post_ct_flow'. Check ct status first in
function "is_post_ct_flow" to achieve this.

Signed-off-by: Wentao Jia <wentao.jia@corigine.com>
Acked-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
index e0d6c87542729d40bd536dd03a82af9ec9c30961..6b90b922bac0ed089d59c6f5a4f2a11b3c3c54ec 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
@@ -94,24 +94,23 @@ bool is_post_ct_flow(struct flow_cls_offload *flow)
        struct flow_match_ct ct;
        int i;
 
-       /* post ct entry cannot contains any ct action except ct_clear. */
-       flow_action_for_each(i, act, &flow->rule->action) {
-               if (act->id == FLOW_ACTION_CT) {
-                       /* ignore ct clear action. */
-                       if (act->ct.action == TCA_CT_ACT_CLEAR) {
-                               exist_ct_clear = true;
-                               continue;
-                       }
-
-                       return false;
-               }
-       }
-
        if (dissector->used_keys & BIT(FLOW_DISSECTOR_KEY_CT)) {
                flow_rule_match_ct(rule, &ct);
                if (ct.key->ct_state & TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED)
                        return true;
        } else {
+               /* post ct entry cannot contains any ct action except ct_clear. */
+               flow_action_for_each(i, act, &flow->rule->action) {
+                       if (act->id == FLOW_ACTION_CT) {
+                               /* ignore ct clear action. */
+                               if (act->ct.action == TCA_CT_ACT_CLEAR) {
+                                       exist_ct_clear = true;
+                                       continue;
+                               }
+
+                               return false;
+                       }
+               }
                /* when do nat with ct, the post ct entry ignore the ct status,
                 * will match the nat field(sip/dip) instead. In this situation,
                 * the flow chain index is not zero and contains ct clear action.