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

Commit de28c99d authored by Prasad Kanneganti's avatar Prasad Kanneganti Committed by David S. Miller
Browse files

liquidio: store the L4 hash of rx packets in skb 



Store the L4 hash of received packets in the skb; the hash is computed in
the NIC firmware.

Signed-off-by: default avatarPrasad Kanneganti <prasad.kanneganti@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5bd36a6f

drivers/net/ethernet/cavium/liquidio/lio_main.c

+16 −2
Original line number Diff line number Diff line
@@ -2263,6 +2263,7 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
	struct skb_shared_hwtstamps *shhwtstamps;

	u64 ns;

	u16 vtag = 0;

	u32 r_dh_off;

	struct net_device *netdev = (struct net_device *)arg;

	struct octeon_droq *droq = container_of(param, struct octeon_droq,

						napi);
@@ -2308,6 +2309,8 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
			put_page(pg_info->page);

		}



		r_dh_off = (rh->r_dh.len - 1) * BYTES_PER_DHLEN_UNIT;



		if (((oct->chip_id == OCTEON_CN66XX) ||

		     (oct->chip_id == OCTEON_CN68XX)) &&

		    ptp_enable) {
@@ -2320,16 +2323,27 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
					/* Nanoseconds are in the first 64-bits

					 * of the packet.

					 */

					memcpy(&ns, (skb->data), sizeof(ns));

					memcpy(&ns, (skb->data + r_dh_off),

					       sizeof(ns));

					r_dh_off -= BYTES_PER_DHLEN_UNIT;

					shhwtstamps = skb_hwtstamps(skb);

					shhwtstamps->hwtstamp =

						ns_to_ktime(ns +

							    lio->ptp_adjust);

				}

				skb_pull(skb, sizeof(ns));

			}

		}



		if (rh->r_dh.has_hash) {

			__be32 *hash_be = (__be32 *)(skb->data + r_dh_off);

			u32 hash = be32_to_cpu(*hash_be);



			skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);

			r_dh_off -= BYTES_PER_DHLEN_UNIT;

		}



		skb_pull(skb, rh->r_dh.len * BYTES_PER_DHLEN_UNIT);



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

		if ((netdev->features & NETIF_F_RXCSUM) &&

		    (((rh->r_dh.encap_on) &&

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+15 −1
Original line number Diff line number Diff line
@@ -1497,6 +1497,7 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
	struct net_device *netdev = (struct net_device *)arg;

	struct sk_buff *skb = (struct sk_buff *)skbuff;

	u16 vtag = 0;

	u32 r_dh_off;



	if (netdev) {

		struct lio *lio = GET_LIO(netdev);
@@ -1540,7 +1541,20 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 
			put_page(pg_info->page);

		}



		skb_pull(skb, rh->r_dh.len * 8);

		r_dh_off = (rh->r_dh.len - 1) * BYTES_PER_DHLEN_UNIT;



		if (rh->r_dh.has_hwtstamp)

			r_dh_off -= BYTES_PER_DHLEN_UNIT;



		if (rh->r_dh.has_hash) {

			__be32 *hash_be = (__be32 *)(skb->data + r_dh_off);

			u32 hash = be32_to_cpu(*hash_be);



			skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);

			r_dh_off -= BYTES_PER_DHLEN_UNIT;

		}



		skb_pull(skb, rh->r_dh.len * BYTES_PER_DHLEN_UNIT);

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



		if ((netdev->features & NETIF_F_RXCSUM) &&

drivers/net/ethernet/cavium/liquidio/liquidio_common.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ enum octeon_tag_type { 
#define CVM_DRV_INVALID_APP         (CVM_DRV_APP_START + 0x2)

#define CVM_DRV_APP_END             (CVM_DRV_INVALID_APP - 1)



#define BYTES_PER_DHLEN_UNIT        8



static inline u32 incr_index(u32 index, u32 count, u32 max)

{

	if ((index + count) >= max)