nfp: flower: pass flow rule pointer directly to match functions

In kernel 5.1, the flow offload API was introduced along with a helper
function to extract the flow_rule from the TC offload struct. Each of the
match helper functions are passed the offload struct and extract the flow
rule to a local variable.

Simplify the code while also removing the extra compat and local variable
calls by extracting the rule once in the main match handler, and passing
a reference to the rule direct to each helper.

This patch does not change driver functionality.

Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Simon Horman <simon.horman@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/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c
index 9cc3ba1..1079f37 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/match.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c
@@ -10,9 +10,8 @@
 static void
 nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *ext,
                            struct nfp_flower_meta_tci *msk,
-                           struct flow_cls_offload *flow, u8 key_type)
+                           struct flow_rule *rule, u8 key_type)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
        u16 tmp_tci;
 
        memset(ext, 0, sizeof(struct nfp_flower_meta_tci));
@@ -77,11 +76,8 @@ nfp_flower_compile_port(struct nfp_flower_in_port *frame, u32 cmsg_port,
 
 static void
 nfp_flower_compile_mac(struct nfp_flower_mac_mpls *ext,
-                      struct nfp_flower_mac_mpls *msk,
-                      struct flow_cls_offload *flow)
+                      struct nfp_flower_mac_mpls *msk, struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        memset(ext, 0, sizeof(struct nfp_flower_mac_mpls));
        memset(msk, 0, sizeof(struct nfp_flower_mac_mpls));
 
@@ -130,10 +126,8 @@ nfp_flower_compile_mac(struct nfp_flower_mac_mpls *ext,
 static void
 nfp_flower_compile_tport(struct nfp_flower_tp_ports *ext,
                         struct nfp_flower_tp_ports *msk,
-                        struct flow_cls_offload *flow)
+                        struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        memset(ext, 0, sizeof(struct nfp_flower_tp_ports));
        memset(msk, 0, sizeof(struct nfp_flower_tp_ports));
 
@@ -150,11 +144,8 @@ nfp_flower_compile_tport(struct nfp_flower_tp_ports *ext,
 
 static void
 nfp_flower_compile_ip_ext(struct nfp_flower_ip_ext *ext,
-                         struct nfp_flower_ip_ext *msk,
-                         struct flow_cls_offload *flow)
+                         struct nfp_flower_ip_ext *msk, struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {
                struct flow_match_basic match;
 
@@ -224,10 +215,8 @@ nfp_flower_compile_ip_ext(struct nfp_flower_ip_ext *ext,
 
 static void
 nfp_flower_compile_ipv4(struct nfp_flower_ipv4 *ext,
-                       struct nfp_flower_ipv4 *msk,
-                       struct flow_cls_offload *flow)
+                       struct nfp_flower_ipv4 *msk, struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
        struct flow_match_ipv4_addrs match;
 
        memset(ext, 0, sizeof(struct nfp_flower_ipv4));
@@ -241,16 +230,13 @@ nfp_flower_compile_ipv4(struct nfp_flower_ipv4 *ext,
                msk->ipv4_dst = match.mask->dst;
        }
 
-       nfp_flower_compile_ip_ext(&ext->ip_ext, &msk->ip_ext, flow);
+       nfp_flower_compile_ip_ext(&ext->ip_ext, &msk->ip_ext, rule);
 }
 
 static void
 nfp_flower_compile_ipv6(struct nfp_flower_ipv6 *ext,
-                       struct nfp_flower_ipv6 *msk,
-                       struct flow_cls_offload *flow)
+                       struct nfp_flower_ipv6 *msk, struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        memset(ext, 0, sizeof(struct nfp_flower_ipv6));
        memset(msk, 0, sizeof(struct nfp_flower_ipv6));
 
@@ -264,16 +250,15 @@ nfp_flower_compile_ipv6(struct nfp_flower_ipv6 *ext,
                msk->ipv6_dst = match.mask->dst;
        }
 
-       nfp_flower_compile_ip_ext(&ext->ip_ext, &msk->ip_ext, flow);
+       nfp_flower_compile_ip_ext(&ext->ip_ext, &msk->ip_ext, rule);
 }
 
 static int
-nfp_flower_compile_geneve_opt(void *ext, void *msk,
-                             struct flow_cls_offload *flow)
+nfp_flower_compile_geneve_opt(void *ext, void *msk, struct flow_rule *rule)
 {
        struct flow_match_enc_opts match;
 
-       flow_rule_match_enc_opts(flow->rule, &match);
+       flow_rule_match_enc_opts(rule, &match);
        memcpy(ext, match.key->data, match.key->len);
        memcpy(msk, match.mask->data, match.mask->len);
 
@@ -283,10 +268,8 @@ nfp_flower_compile_geneve_opt(void *ext, void *msk,
 static void
 nfp_flower_compile_tun_ipv4_addrs(struct nfp_flower_tun_ipv4 *ext,
                                  struct nfp_flower_tun_ipv4 *msk,
-                                 struct flow_cls_offload *flow)
+                                 struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS)) {
                struct flow_match_ipv4_addrs match;
 
@@ -301,10 +284,8 @@ nfp_flower_compile_tun_ipv4_addrs(struct nfp_flower_tun_ipv4 *ext,
 static void
 nfp_flower_compile_tun_ip_ext(struct nfp_flower_tun_ip_ext *ext,
                              struct nfp_flower_tun_ip_ext *msk,
-                             struct flow_cls_offload *flow)
+                             struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IP)) {
                struct flow_match_ip match;
 
@@ -319,10 +300,8 @@ nfp_flower_compile_tun_ip_ext(struct nfp_flower_tun_ip_ext *ext,
 static void
 nfp_flower_compile_ipv4_gre_tun(struct nfp_flower_ipv4_gre_tun *ext,
                                struct nfp_flower_ipv4_gre_tun *msk,
-                               struct flow_cls_offload *flow)
+                               struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        memset(ext, 0, sizeof(struct nfp_flower_ipv4_gre_tun));
        memset(msk, 0, sizeof(struct nfp_flower_ipv4_gre_tun));
 
@@ -341,17 +320,15 @@ nfp_flower_compile_ipv4_gre_tun(struct nfp_flower_ipv4_gre_tun *ext,
                msk->tun_flags = cpu_to_be16(NFP_FL_GRE_FLAG_KEY);
        }
 
-       nfp_flower_compile_tun_ipv4_addrs(&ext->ipv4, &msk->ipv4, flow);
-       nfp_flower_compile_tun_ip_ext(&ext->ip_ext, &msk->ip_ext, flow);
+       nfp_flower_compile_tun_ipv4_addrs(&ext->ipv4, &msk->ipv4, rule);
+       nfp_flower_compile_tun_ip_ext(&ext->ip_ext, &msk->ip_ext, rule);
 }
 
 static void
 nfp_flower_compile_ipv4_udp_tun(struct nfp_flower_ipv4_udp_tun *ext,
                                struct nfp_flower_ipv4_udp_tun *msk,
-                               struct flow_cls_offload *flow)
+                               struct flow_rule *rule)
 {
-       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
-
        memset(ext, 0, sizeof(struct nfp_flower_ipv4_udp_tun));
        memset(msk, 0, sizeof(struct nfp_flower_ipv4_udp_tun));
 
@@ -366,8 +343,8 @@ nfp_flower_compile_ipv4_udp_tun(struct nfp_flower_ipv4_udp_tun *ext,
                msk->tun_id = cpu_to_be32(temp_vni);
        }
 
-       nfp_flower_compile_tun_ipv4_addrs(&ext->ipv4, &msk->ipv4, flow);
-       nfp_flower_compile_tun_ip_ext(&ext->ip_ext, &msk->ip_ext, flow);
+       nfp_flower_compile_tun_ipv4_addrs(&ext->ipv4, &msk->ipv4, rule);
+       nfp_flower_compile_tun_ip_ext(&ext->ip_ext, &msk->ip_ext, rule);
 }
 
 int nfp_flower_compile_flow_match(struct nfp_app *app,
@@ -378,6 +355,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
                                  enum nfp_flower_tun_type tun_type,
                                  struct netlink_ext_ack *extack)
 {
+       struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
        u32 port_id;
        int err;
        u8 *ext;
@@ -393,7 +371,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
 
        nfp_flower_compile_meta_tci((struct nfp_flower_meta_tci *)ext,
                                    (struct nfp_flower_meta_tci *)msk,
-                                   flow, key_ls->key_layer);
+                                   rule, key_ls->key_layer);
        ext += sizeof(struct nfp_flower_meta_tci);
        msk += sizeof(struct nfp_flower_meta_tci);
 
@@ -425,7 +403,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
        if (NFP_FLOWER_LAYER_MAC & key_ls->key_layer) {
                nfp_flower_compile_mac((struct nfp_flower_mac_mpls *)ext,
                                       (struct nfp_flower_mac_mpls *)msk,
-                                      flow);
+                                      rule);
                ext += sizeof(struct nfp_flower_mac_mpls);
                msk += sizeof(struct nfp_flower_mac_mpls);
        }
@@ -433,7 +411,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
        if (NFP_FLOWER_LAYER_TP & key_ls->key_layer) {
                nfp_flower_compile_tport((struct nfp_flower_tp_ports *)ext,
                                         (struct nfp_flower_tp_ports *)msk,
-                                        flow);
+                                        rule);
                ext += sizeof(struct nfp_flower_tp_ports);
                msk += sizeof(struct nfp_flower_tp_ports);
        }
@@ -441,7 +419,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
        if (NFP_FLOWER_LAYER_IPV4 & key_ls->key_layer) {
                nfp_flower_compile_ipv4((struct nfp_flower_ipv4 *)ext,
                                        (struct nfp_flower_ipv4 *)msk,
-                                       flow);
+                                       rule);
                ext += sizeof(struct nfp_flower_ipv4);
                msk += sizeof(struct nfp_flower_ipv4);
        }
@@ -449,7 +427,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
        if (NFP_FLOWER_LAYER_IPV6 & key_ls->key_layer) {
                nfp_flower_compile_ipv6((struct nfp_flower_ipv6 *)ext,
                                        (struct nfp_flower_ipv6 *)msk,
-                                       flow);
+                                       rule);
                ext += sizeof(struct nfp_flower_ipv6);
                msk += sizeof(struct nfp_flower_ipv6);
        }
@@ -457,7 +435,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
        if (key_ls->key_layer_two & NFP_FLOWER_LAYER2_GRE) {
                __be32 tun_dst;
 
-               nfp_flower_compile_ipv4_gre_tun((void *)ext, (void *)msk, flow);
+               nfp_flower_compile_ipv4_gre_tun((void *)ext, (void *)msk, rule);
                tun_dst = ((struct nfp_flower_ipv4_gre_tun *)ext)->ipv4.dst;
                ext += sizeof(struct nfp_flower_ipv4_gre_tun);
                msk += sizeof(struct nfp_flower_ipv4_gre_tun);
@@ -473,7 +451,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
            key_ls->key_layer_two & NFP_FLOWER_LAYER2_GENEVE) {
                __be32 tun_dst;
 
-               nfp_flower_compile_ipv4_udp_tun((void *)ext, (void *)msk, flow);
+               nfp_flower_compile_ipv4_udp_tun((void *)ext, (void *)msk, rule);
                tun_dst = ((struct nfp_flower_ipv4_udp_tun *)ext)->ipv4.dst;
                ext += sizeof(struct nfp_flower_ipv4_udp_tun);
                msk += sizeof(struct nfp_flower_ipv4_udp_tun);
@@ -485,7 +463,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
                nfp_tunnel_add_ipv4_off(app, tun_dst);
 
                if (key_ls->key_layer_two & NFP_FLOWER_LAYER2_GENEVE_OP) {
-                       err = nfp_flower_compile_geneve_opt(ext, msk, flow);
+                       err = nfp_flower_compile_geneve_opt(ext, msk, rule);
                        if (err)
                                return err;
                }