Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dda0e746 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Add IPV6 hardware RFS support. 



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

Signed-off-by: default avatarMichael Chan <michael.chan@broadocm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8427af81

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+27 −5
Original line number Diff line number Diff line
@@ -3316,10 +3316,26 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, 
	req.ip_addr_type = CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;

	req.ip_protocol = keys->basic.ip_proto;



	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);
@@ -6588,12 +6604,18 @@ 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;

		goto err_free;

	}

	if (fkeys->basic.n_proto == htons(ETH_P_IPV6) &&

	    bp->hwrm_spec_code < 0x10601) {

		rc = -EPROTONOSUPPORT;

		goto err_free;

	}



	memcpy(new_fltr->dst_mac_addr, eth->h_dest, ETH_ALEN);

	memcpy(new_fltr->src_mac_addr, eth->h_source, ETH_ALEN);

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+39 −14
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd) 


fltr_found:

	fkeys = &fltr->fkeys;

	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)
@@ -542,6 +543,30 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd) 


		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_ip6_spec.pdst = fkeys->ports.dst;

		fs->m_u.tcp_ip6_spec.pdst = cpu_to_be16(~0);

	}



	fs->ring_cookie = fltr->rxq;

	rc = 0;