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

Commit a334b5fb authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

bnx2x: populate skb->l4_rxhash 



l4_rxhash is set on skb when rxhash is obtained from canonical 4-tuple
over transport ports/addresses.

We can set skb->l4_rxhash for all incoming TCP packets on bnx2x for
free, as cqe status contains a hash type information.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Eilon Greenstein <eilong@broadcom.com>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c9df5fe

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+1 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ struct bnx2x_agg_info { 
	u16			vlan_tag;

	u16			len_on_bd;

	u32			rxhash;

	bool			l4_rxhash;

	u16			gro_size;

	u16			full_page;

};

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+15 −4
Original line number Diff line number Diff line
@@ -295,12 +295,20 @@ static inline void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp, 
 * CQE (calculated by HW).

 */

static u32 bnx2x_get_rxhash(const struct bnx2x *bp,

			    const struct eth_fast_path_rx_cqe *cqe)

			    const struct eth_fast_path_rx_cqe *cqe,

			    bool *l4_rxhash)

{

	/* Set Toeplitz hash from CQE */

	if ((bp->dev->features & NETIF_F_RXHASH) &&

	    (cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))

	    (cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG)) {

		enum eth_rss_hash_type htype;



		htype = cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_TYPE;

		*l4_rxhash = (htype == TCP_IPV4_HASH_TYPE) ||

			     (htype == TCP_IPV6_HASH_TYPE);

		return le32_to_cpu(cqe->rss_hash_result);

	}

	*l4_rxhash = false;

	return 0;

}
@@ -354,7 +362,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue, 
	tpa_info->tpa_state = BNX2X_TPA_START;

	tpa_info->len_on_bd = le16_to_cpu(cqe->len_on_bd);

	tpa_info->placement_offset = cqe->placement_offset;

	tpa_info->rxhash = bnx2x_get_rxhash(bp, cqe);

	tpa_info->rxhash = bnx2x_get_rxhash(bp, cqe, &tpa_info->l4_rxhash);

	if (fp->mode == TPA_MODE_GRO) {

		u16 gro_size = le16_to_cpu(cqe->pkt_len_or_gro_seg_len);

		tpa_info->full_page =
@@ -589,6 +597,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, 
		skb_reserve(skb, pad + NET_SKB_PAD);

		skb_put(skb, len);

		skb->rxhash = tpa_info->rxhash;

		skb->l4_rxhash = tpa_info->l4_rxhash;



		skb->protocol = eth_type_trans(skb, bp->dev);

		skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -712,6 +721,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 
		enum eth_rx_cqe_type cqe_fp_type;

		u16 len, pad, queue;

		u8 *data;

		bool l4_rxhash;



#ifdef BNX2X_STOP_ON_ERROR

		if (unlikely(bp->panic))
@@ -855,7 +865,8 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 
		skb->protocol = eth_type_trans(skb, bp->dev);



		/* Set Toeplitz hash for a none-LRO skb */

		skb->rxhash = bnx2x_get_rxhash(bp, cqe_fp);

		skb->rxhash = bnx2x_get_rxhash(bp, cqe_fp, &l4_rxhash);

		skb->l4_rxhash = l4_rxhash;



		skb_checksum_none_assert(skb);