bnxt_en: Add IPV6 hardware RFS support.

Orabug: 25645429

Accept ipv6 flows in .ndo_rx_flow_steer() and support ETHTOOL_GRXCLSRULE
ipv6 flows.

Signed-off-by: Michael Chan <michael.chan@broadocm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit dda0e7465f040ed814d4a5c98c6bf042e59cba69)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
	drivers/net/ethernet/broadcom/bnxt/bnxt.c
	drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index e65d191ebc220ac50047937bbab9043448c07770..07d1cb983f1a4c74197d8ed129ed3a1b80af5ea5 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3320,10 +3320,26 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,
 #ifdef NEW_FLOW_KEYS
        req.ip_protocol = keys->basic.ip_proto;
 
-       req.src_ipaddr[0] = keys->addrs.v4addrs.src;
-       req.src_ipaddr_mask[0] = cpu_to_be32(0xffffffff);
-       req.dst_ipaddr[0] = keys->addrs.v4addrs.dst;
-       req.dst_ipaddr_mask[0] = cpu_to_be32(0xffffffff);
+       if (keys->basic.n_proto == htons(ETH_P_IPV6)) {
+               int i;
+
+               req.ethertype = htons(ETH_P_IPV6);
+               req.ip_addr_type =
+                       CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6;
+               *(struct in6_addr *)&req.src_ipaddr[0] =
+                       keys->addrs.v6addrs.src;
+               *(struct in6_addr *)&req.dst_ipaddr[0] =
+                       keys->addrs.v6addrs.dst;
+               for (i = 0; i < 4; i++) {
+                       req.src_ipaddr_mask[i] = cpu_to_be32(0xffffffff);
+                       req.dst_ipaddr_mask[i] = cpu_to_be32(0xffffffff);
+               }
+       } else {
+               req.src_ipaddr[0] = keys->addrs.v4addrs.src;
+               req.src_ipaddr_mask[0] = cpu_to_be32(0xffffffff);
+               req.dst_ipaddr[0] = keys->addrs.v4addrs.dst;
+               req.dst_ipaddr_mask[0] = cpu_to_be32(0xffffffff);
+       }
 
        req.src_port = keys->ports.src;
        req.src_port_mask = cpu_to_be16(0xffff);
@@ -6636,7 +6652,8 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
                goto err_free;
        }
 
-       if ((fkeys->basic.n_proto != htons(ETH_P_IP)) ||
+       if ((fkeys->basic.n_proto != htons(ETH_P_IP) &&
+            fkeys->basic.n_proto != htons(ETH_P_IPV6)) ||
            ((fkeys->basic.ip_proto != IPPROTO_TCP) &&
             (fkeys->basic.ip_proto != IPPROTO_UDP))) {
                rc = -EPROTONOSUPPORT;
@@ -6665,6 +6682,14 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
 #endif
 #endif
 
+#ifdef NEW_FLOW_KEYS
+       if (fkeys->basic.n_proto == htons(ETH_P_IPV6) &&
+           bp->hwrm_spec_code < 0x10601) {
+               rc = -EPROTONOSUPPORT;
+               goto err_free;
+       }
+#endif
+
        memcpy(new_fltr->dst_mac_addr, eth->h_dest, ETH_ALEN);
        memcpy(new_fltr->src_mac_addr, eth->h_source, ETH_ALEN);
 

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 1f7026c8a44b23b446072d95d67ccf24e585e939..2c52ba4cb28c0aa180313662262b5f164fcfce96 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -530,24 +530,49 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)
 fltr_found:
        fkeys = &fltr->fkeys;
 #ifdef NEW_FLOW_KEYS
-       if (fkeys->basic.ip_proto == IPPROTO_TCP)
-               fs->flow_type = TCP_V4_FLOW;
-       else if (fkeys->basic.ip_proto == IPPROTO_UDP)
-               fs->flow_type = UDP_V4_FLOW;
-       else
-               goto fltr_err;
+       if (fkeys->basic.n_proto == htons(ETH_P_IP)) {
+               if (fkeys->basic.ip_proto == IPPROTO_TCP)
+                       fs->flow_type = TCP_V4_FLOW;
+               else if (fkeys->basic.ip_proto == IPPROTO_UDP)
+                       fs->flow_type = UDP_V4_FLOW;
+               else
+                       goto fltr_err;
+
+               fs->h_u.tcp_ip4_spec.ip4src = fkeys->addrs.v4addrs.src;
+               fs->m_u.tcp_ip4_spec.ip4src = cpu_to_be32(~0);
 
-       fs->h_u.tcp_ip4_spec.ip4src = fkeys->addrs.v4addrs.src;
-       fs->m_u.tcp_ip4_spec.ip4src = cpu_to_be32(~0);
+               fs->h_u.tcp_ip4_spec.ip4dst = fkeys->addrs.v4addrs.dst;
+               fs->m_u.tcp_ip4_spec.ip4dst = cpu_to_be32(~0);
 
-       fs->h_u.tcp_ip4_spec.ip4dst = fkeys->addrs.v4addrs.dst;
-       fs->m_u.tcp_ip4_spec.ip4dst = cpu_to_be32(~0);
+               fs->h_u.tcp_ip4_spec.psrc = fkeys->ports.src;
+               fs->m_u.tcp_ip4_spec.psrc = cpu_to_be16(~0);
 
-       fs->h_u.tcp_ip4_spec.psrc = fkeys->ports.src;
-       fs->m_u.tcp_ip4_spec.psrc = cpu_to_be16(~0);
+               fs->h_u.tcp_ip4_spec.pdst = fkeys->ports.dst;
+               fs->m_u.tcp_ip4_spec.pdst = cpu_to_be16(~0);
+       } else {
+               int i;
+
+               if (fkeys->basic.ip_proto == IPPROTO_TCP)
+                       fs->flow_type = TCP_V6_FLOW;
+               else if (fkeys->basic.ip_proto == IPPROTO_UDP)
+                       fs->flow_type = UDP_V6_FLOW;
+               else
+                       goto fltr_err;
+
+               *(struct in6_addr *)&fs->h_u.tcp_ip6_spec.ip6src[0] =
+                       fkeys->addrs.v6addrs.src;
+               *(struct in6_addr *)&fs->h_u.tcp_ip6_spec.ip6dst[0] =
+                       fkeys->addrs.v6addrs.dst;
+               for (i = 0; i < 4; i++) {
+                       fs->m_u.tcp_ip6_spec.ip6src[i] = cpu_to_be32(~0);
+                       fs->m_u.tcp_ip6_spec.ip6dst[i] = cpu_to_be32(~0);
+               }
+               fs->h_u.tcp_ip6_spec.psrc = fkeys->ports.src;
+               fs->m_u.tcp_ip6_spec.psrc = cpu_to_be16(~0);
 
-       fs->h_u.tcp_ip4_spec.pdst = fkeys->ports.dst;
-       fs->m_u.tcp_ip4_spec.pdst = cpu_to_be16(~0);
+               fs->h_u.tcp_ip6_spec.pdst = fkeys->ports.dst;
+               fs->m_u.tcp_ip6_spec.pdst = cpu_to_be16(~0);
+       }
 
 #else
        if (fkeys->ip_proto == IPPROTO_TCP)
@@ -578,7 +603,7 @@ fltr_err:
 
        return rc;
 }
-#endif
+#endif /* CONFIG_RFS_ACCEL */
 
 static u64 get_ethtool_ipv4_rss(struct bnxt *bp)
 {