svn commit: r297650 - stable/9/sys/ofed/drivers/net/mlx4

[Hans Petter Selasky]

Author: hselasky
Date: Thu Apr  7 07:33:40 2016
New Revision: 297650
URL: https://svnweb.freebsd.org/changeset/base/297650

Log:
  MFC r296910:
  Use hardware computed Toeplitz hash for incoming flowids
  
  Use the Toeplitz hash value as source for the flowid. This makes the
  hash value more suitable for so-called hash bucket algorithms which
  are used in the FreeBSD's TCP/IP stack when RSS is enabled.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/9/sys/ofed/drivers/net/mlx4/en_rx.c
  stable/9/sys/ofed/drivers/net/mlx4/en_tx.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ofed/drivers/net/mlx4/en_rx.c
==============================================================================
--- stable/9/sys/ofed/drivers/net/mlx4/en_rx.c	Thu Apr  7 07:31:17 2016	(r297649)
+++ stable/9/sys/ofed/drivers/net/mlx4/en_rx.c	Thu Apr  7 07:33:40 2016	(r297650)
@@ -616,7 +616,8 @@ int mlx4_en_process_rx_cq(struct net_dev
 			goto next;
 		}
 
-		mb->m_pkthdr.flowid = cq->ring;
+		/* forward Toeplitz compatible hash value */
+		mb->m_pkthdr.flowid = be32_to_cpu(cqe->immed_rss_invalid);
 		mb->m_flags |= M_FLOWID;
 		mb->m_pkthdr.rcvif = dev;
 		if (be32_to_cpu(cqe->vlan_my_qpn) &

Modified: stable/9/sys/ofed/drivers/net/mlx4/en_tx.c
==============================================================================
--- stable/9/sys/ofed/drivers/net/mlx4/en_tx.c	Thu Apr  7 07:31:17 2016	(r297649)
+++ stable/9/sys/ofed/drivers/net/mlx4/en_tx.c	Thu Apr  7 07:33:40 2016	(r297650)
@@ -1061,7 +1061,7 @@ mlx4_en_transmit(struct ifnet *dev, stru
 
 	/* Compute which queue to use */
 	if (m->m_flags & M_FLOWID) {
-		i = m->m_pkthdr.flowid % priv->tx_ring_num;
+		i = (m->m_pkthdr.flowid % 128) % priv->tx_ring_num;
 	}
 	else {
 		i = mlx4_en_select_queue(dev, m);