i40e: check multi-bit state correctly

The hash is reported correctly in the rss field if and only if
the filter status is 3.  Other values of filter status mean
different things and we shouldn't depend on a bitwise result.

The issue was that
a & b --> returns true for b={1,2,3}
the fix is
a & b == b

Also refactor this function to use constant operations because we
are in fast path.

Change-Id: I4e29be87439c1cf8b60bc31bea29dff89596c013
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index f1f03bc5c729131bacdb13e243213b18b5b43132..01d0334fa926b3e5c73039a0fa90805b1e4c2786 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -891,13 +891,15 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
 static inline u32 i40e_rx_hash(struct i40e_ring *ring,
                               union i40e_rx_desc *rx_desc)
 {
-       if (ring->netdev->features & NETIF_F_RXHASH) {
-               if ((le64_to_cpu(rx_desc->wb.qword1.status_error_len) >>
-                    I40E_RX_DESC_STATUS_FLTSTAT_SHIFT) &
-                   I40E_RX_DESC_FLTSTAT_RSS_HASH)
-                       return le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);
-       }
-       return 0;
+       const __le64 rss_mask =
+               cpu_to_le64((u64)I40E_RX_DESC_FLTSTAT_RSS_HASH <<
+                           I40E_RX_DESC_STATUS_FLTSTAT_SHIFT);
+
+       if ((ring->netdev->features & NETIF_F_RXHASH) &&
+           (rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask)
+               return le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);
+       else
+               return 0;
 }
 
 /**