From patchwork Fri Nov 30 18:31:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gallatin X-Patchwork-Id: 203023 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9F4902C007E for ; Sat, 1 Dec 2012 05:39:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031049Ab2K3Sjl (ORCPT ); Fri, 30 Nov 2012 13:39:41 -0500 Received: from mail-ye0-f174.google.com ([209.85.213.174]:50040 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755843Ab2K3Sjk (ORCPT ); Fri, 30 Nov 2012 13:39:40 -0500 Received: by mail-ye0-f174.google.com with SMTP id m6so116094yen.19 for ; Fri, 30 Nov 2012 10:39:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=nb0zr2yOO0IwFiOLTo5ENcyijSnZeGK3vuuAmWQvwdY=; b=giI7YAQyy+A3OLvk9oCThA/Taif4grc3c4pUXKZFAHo0YrP+fLAtnDiTu3362I2sD7 jQ1rfK4feoAwpXbfIYvmdQRL46AfiO/VkTCSfTRfFpWuvNZTInU6kWgcjnvqSU2ml1yP UlPfBOo9yzxvOEBtJuhQkyPQ9MhXqbHehGjWvyY8xReRVONwwjlz+CtGFlr93M1maxnQ VC9zVHYg1gDe2GdM+hkwjKo+mcFLpxf08CO4IG2JPkI649qJl/30VeM0D9FBaLzpbhSJ futtBOJ6W7HilMS4ndZhtZEgMf0GfhtG3nk0gLmwDxGnRvm3ylJRNLQlfKDGcaBUCunw gEZQ== Received: by 10.236.48.37 with SMTP id u25mr2519582yhb.4.1354300333405; Fri, 30 Nov 2012 10:32:13 -0800 (PST) Received: from drogon.sw.myri.com (c-24-125-204-77.hsd1.va.comcast.net. [24.125.204.77]) by mx.google.com with ESMTPS id s1sm5063888anj.1.2012.11.30.10.32.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Nov 2012 10:32:12 -0800 (PST) From: Andrew Gallatin To: davem@davemloft.net Cc: netdev@vger.kernel.org, Andrew Gallatin Subject: [PATCH v3 resend net-next 2/2] myri10ge: Add vlan rx for better GRO perf. Date: Fri, 30 Nov 2012 13:31:59 -0500 Message-Id: <1354300319-30771-3-git-send-email-gallatin@myri.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354300319-30771-1-git-send-email-gallatin@myri.com> References: <20121130.121705.1923519039781698493.davem@davemloft.net> <1354300319-30771-1-git-send-email-gallatin@myri.com> X-Gm-Message-State: ALoCoQmB7TN/8jTEh2xpbcu3f2DIWG3K8jsroBOmLCEd4QWLXz0Lguo7MRRAgEQyJBBktLWYPbMV Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 84207c0..2fc984a 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -1264,6 +1264,42 @@ 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; + __wsum vsum; + + 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) { + vsum = csum_partial(va + ETH_HLEN, VLAN_HLEN, 0); + skb->csum = csum_sub(skb->csum, vsum); + } + /* 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) { @@ -1326,6 +1362,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]); napi_gro_frags(&ss->napi); @@ -3851,6 +3888,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)