nfp: add set ipv6 source and destination address

Previously we did not have offloading support for set IPv6 actions. This
patch enables TC flower offload of set IPv6 src and dst address actions.

Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index 2f886a529ee498dd2760b2b2e116060c77d6c9b3..4394e4f15fdb244760045f3a04b99c681666d317 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -302,9 +302,55 @@ nfp_fl_set_ip4(const struct tc_action *action, int idx, u32 off,
        return 0;
 }
 
+static void
+nfp_fl_set_ip6_helper(int opcode_tag, int idx, __be32 exact, __be32 mask,
+                     struct nfp_fl_set_ipv6_addr *ip6)
+{
+       u16 tmp_set_op;
+
+       ip6->ipv6[idx % 4].mask = mask;
+       ip6->ipv6[idx % 4].exact = exact;
+
+       ip6->reserved = cpu_to_be16(0);
+       tmp_set_op = FIELD_PREP(NFP_FL_ACT_LEN_LW, sizeof(*ip6) >>
+                               NFP_FL_LW_SIZ) |
+                    FIELD_PREP(NFP_FL_ACT_JMP_ID, opcode_tag);
+       ip6->a_op = cpu_to_be16(tmp_set_op);
+}
+
+static int
+nfp_fl_set_ip6(const struct tc_action *action, int idx, u32 off,
+              struct nfp_fl_set_ipv6_addr *ip_dst,
+              struct nfp_fl_set_ipv6_addr *ip_src)
+{
+       __be32 exact, mask;
+
+       /* We are expecting tcf_pedit to return a big endian value */
+       mask = (__force __be32)~tcf_pedit_mask(action, idx);
+       exact = (__force __be32)tcf_pedit_val(action, idx);
+
+       if (exact & ~mask)
+               return -EOPNOTSUPP;
+
+       if (off < offsetof(struct ipv6hdr, saddr))
+               return -EOPNOTSUPP;
+       else if (off < offsetof(struct ipv6hdr, daddr))
+               nfp_fl_set_ip6_helper(NFP_FL_ACTION_OPCODE_SET_IPV6_SRC, idx,
+                                     exact, mask, ip_src);
+       else if (off < offsetof(struct ipv6hdr, daddr) +
+                      sizeof(struct in6_addr))
+               nfp_fl_set_ip6_helper(NFP_FL_ACTION_OPCODE_SET_IPV6_DST, idx,
+                                     exact, mask, ip_dst);
+       else
+               return -EOPNOTSUPP;
+
+       return 0;
+}
+
 static int
 nfp_fl_pedit(const struct tc_action *action, char *nfp_action, int *a_len)
 {
+       struct nfp_fl_set_ipv6_addr set_ip6_dst, set_ip6_src;
        struct nfp_fl_set_ip4_addrs set_ip_addr;
        struct nfp_fl_set_eth set_eth;
        enum pedit_header_type htype;
@@ -312,6 +358,8 @@ nfp_fl_pedit(const struct tc_action *action, char *nfp_action, int *a_len)
        size_t act_size;
        u32 offset, cmd;
 
+       memset(&set_ip6_dst, 0, sizeof(set_ip6_dst));
+       memset(&set_ip6_src, 0, sizeof(set_ip6_src));
        memset(&set_ip_addr, 0, sizeof(set_ip_addr));
        memset(&set_eth, 0, sizeof(set_eth));
        nkeys = tcf_pedit_nkeys(action);
@@ -331,6 +379,10 @@ nfp_fl_pedit(const struct tc_action *action, char *nfp_action, int *a_len)
                case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4:
                        err = nfp_fl_set_ip4(action, idx, offset, &set_ip_addr);
                        break;
+               case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6:
+                       err = nfp_fl_set_ip6(action, idx, offset, &set_ip6_dst,
+                                            &set_ip6_src);
+                       break;
                default:
                        return -EOPNOTSUPP;
                }
@@ -346,6 +398,26 @@ nfp_fl_pedit(const struct tc_action *action, char *nfp_action, int *a_len)
                act_size = sizeof(set_ip_addr);
                memcpy(nfp_action, &set_ip_addr, act_size);
                *a_len += act_size;
+       } else if (set_ip6_dst.a_op && set_ip6_src.a_op) {
+               /* TC compiles set src and dst IPv6 address as a single action,
+                * the hardware requires this to be 2 separate actions.
+                */
+               act_size = sizeof(set_ip6_src);
+               memcpy(nfp_action, &set_ip6_src, act_size);
+               *a_len += act_size;
+
+               act_size = sizeof(set_ip6_dst);
+               memcpy(&nfp_action[sizeof(set_ip6_src)], &set_ip6_dst,
+                      act_size);
+               *a_len += act_size;
+       } else if (set_ip6_dst.a_op) {
+               act_size = sizeof(set_ip6_dst);
+               memcpy(nfp_action, &set_ip6_dst, act_size);
+               *a_len += act_size;
+       } else if (set_ip6_src.a_op) {
+               act_size = sizeof(set_ip6_src);
+               memcpy(nfp_action, &set_ip6_src, act_size);
+               *a_len += act_size;
        }
 
        return 0;

diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index 7ace557fdf8417f226f4308d6914793870baf2b8..527914e294d7bb1ecc2dee5a6a2db157392c414e 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -79,6 +79,8 @@
 #define NFP_FL_ACTION_OPCODE_SET_IPV4_TUNNEL   6
 #define NFP_FL_ACTION_OPCODE_SET_ETHERNET      7
 #define NFP_FL_ACTION_OPCODE_SET_IPV4_ADDRS    9
+#define NFP_FL_ACTION_OPCODE_SET_IPV6_SRC      11
+#define NFP_FL_ACTION_OPCODE_SET_IPV6_DST      12
 #define NFP_FL_ACTION_OPCODE_PRE_TUNNEL                17
 #define NFP_FL_ACTION_OPCODE_NUM               32
 
@@ -125,6 +127,15 @@ struct nfp_fl_set_ip4_addrs {
        __be32 ipv4_dst;
 };
 
+struct nfp_fl_set_ipv6_addr {
+       __be16 a_op;
+       __be16 reserved;
+       struct {
+               __be32 mask;
+               __be32 exact;
+       } ipv6[4];
+};
+
 struct nfp_fl_output {
        __be16 a_op;
        __be16 flags;