evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/mlx4_en: Extend usage of napi_gro_frags

Browse source 
We can call napi_gro_frags for all the received traffic regardless
of the checksum status. Specifically, received packets whose status
is CHECKSUM_NONE (and soon to be added CHECKSUM_COMPLETE)
are eligible for napi_gro_frags as well.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Shani Michaeli <shanim@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shani Michaeli 2014-11-09 13:51:52 +02:00 • committed by David S. Miller
parent b00394c007
commit dd65beac48
1 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/net/ethernet/mellanox/mlx4/en_rx.c
View file

@ -747,6 +747,16 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
if ((cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) && if ((cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) &&
(cqe->checksum == cpu_to_be16(0xffff))) { (cqe->checksum == cpu_to_be16(0xffff))) {
ring->csum_ok++; ring->csum_ok++;
ip_summed = CHECKSUM_UNNECESSARY;
} else {
ip_summed = CHECKSUM_NONE;
ring->csum_none++;
}
} else {
ip_summed = CHECKSUM_NONE;
ring->csum_none++;
}
/* This packet is eligible for GRO if it is: /* This packet is eligible for GRO if it is:
* - DIX Ethernet (type interpretation) * - DIX Ethernet (type interpretation)
* - TCP/IP (v4) * - TCP/IP (v4)
@ -769,10 +779,10 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
skb_shinfo(gro_skb)->nr_frags = nr; skb_shinfo(gro_skb)->nr_frags = nr;
gro_skb->len = length; gro_skb->len = length;
gro_skb->data_len = length; gro_skb->data_len = length;
gro_skb->ip_summed = CHECKSUM_UNNECESSARY; gro_skb->ip_summed = ip_summed;
if (l2_tunnel) if (l2_tunnel && ip_summed == CHECKSUM_UNNECESSARY)
gro_skb->csum_level = 1; gro_skb->encapsulation = 1;
if ((cqe->vlan_my_qpn & if ((cqe->vlan_my_qpn &
cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) && cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) &&
(dev->features & NETIF_F_HW_VLAN_CTAG_RX)) { (dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
@ -801,16 +811,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
} }
/* GRO not possible, complete processing here */ /* GRO not possible, complete processing here */
ip_summed = CHECKSUM_UNNECESSARY;
} else {
ip_summed = CHECKSUM_NONE;
ring->csum_none++;
}
} else {
ip_summed = CHECKSUM_NONE;
ring->csum_none++;
}
skb = mlx4_en_rx_skb(priv, rx_desc, frags, length); skb = mlx4_en_rx_skb(priv, rx_desc, frags, length);
if (!skb) { if (!skb) {
priv->stats.rx_dropped++; priv->stats.rx_dropped++;