| Message ID | 50B68038.5000304@myri.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Andrew Gallatin <gallatin@myri.com> Date: Wed, 28 Nov 2012 16:20:56 -0500 > + if ((dev->features & (NETIF_F_HW_VLAN_RX)) == NETIF_F_HW_VLAN_RX && > + (veh->h_vlan_proto == ntohs(ETH_P_8021Q))) { > + /* fixup csum if needed */ > + if (skb->ip_summed == CHECKSUM_COMPLETE) > + skb->csum = csum_sub(skb->csum, > + csum_partial(va + ETH_HLEN, > + VLAN_HLEN, 0)); This indentation looks like spaghetti, verify that this kind of error doesn't exist in the rest of your patches, and resend the series. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/29/12 13:17, David Miller wrote: > From: Andrew Gallatin <gallatin@myri.com> > Date: Wed, 28 Nov 2012 16:20:56 -0500 > >> + if ((dev->features & (NETIF_F_HW_VLAN_RX)) == NETIF_F_HW_VLAN_RX && >> + (veh->h_vlan_proto == ntohs(ETH_P_8021Q))) { >> + /* fixup csum if needed */ >> + if (skb->ip_summed == CHECKSUM_COMPLETE) >> + skb->csum = csum_sub(skb->csum, >> + csum_partial(va + ETH_HLEN, >> + VLAN_HLEN, 0)); > > This indentation looks like spaghetti, verify that this kind of error > doesn't exist in the rest of your patches, and resend the series. > Sorry. Emacs victim... I'll clean it up & re-submit. I'd stupidly assumed that checkpatch would verify indentation. :( Drew -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2012-11-29 at 14:19 -0500, Andrew Gallatin wrote: > On 11/29/12 13:17, David Miller wrote: > > From: Andrew Gallatin <gallatin@myri.com> > > Date: Wed, 28 Nov 2012 16:20:56 -0500 > > > >> + if ((dev->features & (NETIF_F_HW_VLAN_RX)) == NETIF_F_HW_VLAN_RX && > >> + (veh->h_vlan_proto == ntohs(ETH_P_8021Q))) { > >> + /* fixup csum if needed */ > >> + if (skb->ip_summed == CHECKSUM_COMPLETE) > >> + skb->csum = csum_sub(skb->csum, > >> + csum_partial(va + ETH_HLEN, > >> + VLAN_HLEN, 0)); > > > > This indentation looks like spaghetti, verify that this kind of error > > doesn't exist in the rest of your patches, and resend the series. > > > > Sorry. Emacs victim... I'll clean it up & re-submit. I'd stupidly > assumed that checkpatch would verify indentation. :( checkpatch --strict -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/29/12 14:47, Joe Perches wrote: > On Thu, 2012-11-29 at 14:19 -0500, Andrew Gallatin wrote: >> On 11/29/12 13:17, David Miller wrote: >>> From: Andrew Gallatin <gallatin@myri.com> >>> Date: Wed, 28 Nov 2012 16:20:56 -0500 >>> >>>> + if ((dev->features & (NETIF_F_HW_VLAN_RX)) == NETIF_F_HW_VLAN_RX && >>>> + (veh->h_vlan_proto == ntohs(ETH_P_8021Q))) { >>>> + /* fixup csum if needed */ >>>> + if (skb->ip_summed == CHECKSUM_COMPLETE) >>>> + skb->csum = csum_sub(skb->csum, >>>> + csum_partial(va + ETH_HLEN, >>>> + VLAN_HLEN, 0)); >>> >>> This indentation looks like spaghetti, verify that this kind of error >>> doesn't exist in the rest of your patches, and resend the series. >>> >> >> Sorry. Emacs victim... I'll clean it up & re-submit. I'd stupidly >> assumed that checkpatch would verify indentation. :( > > checkpatch --strict > That catches one formatting error in the patch, but does not complain about the indentation issues. Drew -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index a5ab2f2..93ed089 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -1264,6 +1264,41 @@ myri10ge_unmap_rx_page(struct pci_dev *pdev, } } +/* + * GRO does not support acceleration of tagged vlan frames, and + * this NIC does not support vlan tag offload, so we must pop + * the tag ourselves to be able to achieve GRO performance that + * is comparable to LRO. + */ + +static inline void +myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb) +{ + u8 *va; + struct vlan_ethhdr *veh; + struct skb_frag_struct *frag; + + va = addr; + va += MXGEFW_PAD; + veh = (struct vlan_ethhdr *) va; + if ((dev->features & (NETIF_F_HW_VLAN_RX)) == NETIF_F_HW_VLAN_RX && + (veh->h_vlan_proto == ntohs(ETH_P_8021Q))) { + /* fixup csum if needed */ + if (skb->ip_summed == CHECKSUM_COMPLETE) + skb->csum = csum_sub(skb->csum, + csum_partial(va + ETH_HLEN, + VLAN_HLEN, 0)); + /* pop tag */ + __vlan_hwaccel_put_tag(skb, ntohs(veh->h_vlan_TCI)); + memmove(va + VLAN_HLEN, va, 2 * ETH_ALEN); + skb->len -= VLAN_HLEN; + skb->data_len -= VLAN_HLEN; + frag = skb_shinfo(skb)->frags; + frag->page_offset += VLAN_HLEN; + skb_frag_size_set(frag, skb_frag_size(frag) - VLAN_HLEN); + } +} + static inline int myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum) { @@ -1329,6 +1364,7 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum) skb->ip_summed = CHECKSUM_COMPLETE; skb->csum = csum; } + myri10ge_vlan_rx(mgp->dev, va, skb); skb_record_rx_queue(skb, ss - &mgp->ss[0]);
Unlike LRO, GRO requires that vlan tags be removed before aggregation can occur. Since the myri10ge NIC does not support hardware vlan tag offload, we must remove the tag in the driver to achieve performance comparable to LRO for vlan tagged frames. Thanks to Eric Duzamet for his help simplifying the original patch. Signed-off-by: Andrew Gallatin <gallatin@myri.com> --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) napi_gro_frags(&ss->napi); @@ -3854,6 +3890,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->netdev_ops = &myri10ge_netdev_ops; netdev->mtu = myri10ge_initial_mtu; netdev->hw_features = mgp->features | NETIF_F_RXCSUM; + + /* fake NETIF_F_HW_VLAN_RX for good GRO performance */ + netdev->hw_features |= NETIF_F_HW_VLAN_RX; + netdev->features = netdev->hw_features; if (dac_enabled)