From patchwork Fri Sep 19 22:23:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Yasevich X-Patchwork-Id: 391422 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 3511C14016B for ; Sat, 20 Sep 2014 08:23:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932481AbaISWXb (ORCPT ); Fri, 19 Sep 2014 18:23:31 -0400 Received: from mail-qc0-f181.google.com ([209.85.216.181]:35396 "EHLO mail-qc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932467AbaISWXW (ORCPT ); Fri, 19 Sep 2014 18:23:22 -0400 Received: by mail-qc0-f181.google.com with SMTP id r5so3884919qcx.26 for ; Fri, 19 Sep 2014 15:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wSNyQCCHgzv2+PZ8X/vbnwH4UYlyOpBZvI6uuUtN3Bs=; b=tC5pcdZZDGLkx8xwXKOdBnjAhnWAHN5LhXXJpEloSWo7o+YcePhu0E0JkgSG+T/mSC ox20pjGVR+NbWOs7mYR/zjHEXPTTbBSj7UH4OL5hI/KAtPYRhGzQY767AtcvaQmS7FiB NRgDv8mqcmQ0vEthk8nmWMgfluAfnlysAo0z0+UngSVai5CO2fTAeEklGBfzMFtjj859 zdyPfQnnpyrSUVK0BquYLCLsQUYZivZSdKc5pxXoW6cE1IkRG1QSU787rO2cbDladNwq ar0BWHeB/oUV0kpvxEpyX62hkqLd0S0XCf2SGKW6bZr1Lx+RCMtcJ95CDAVV5FxQi69T uFcg== X-Received: by 10.224.112.65 with SMTP id v1mr4696578qap.80.1411165401388; Fri, 19 Sep 2014 15:23:21 -0700 (PDT) Received: from flash.redhat.com (pool-70-109-150-95.cncdnh.east.myfairpoint.net. [70.109.150.95]) by mx.google.com with ESMTPSA id l7sm2391910qae.45.2014.09.19.15.23.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Sep 2014 15:23:20 -0700 (PDT) From: Vladislav Yasevich X-Google-Original-From: Vladislav Yasevich To: netdev@vger.kernel.org Cc: Vladislav Yasevich , Prashant Sreedharan , Michael Chan Subject: [PATCH v2 1/2] tg3: Work around HW/FW limitations with vlan encapsulated frames Date: Fri, 19 Sep 2014 18:23:08 -0400 Message-Id: <1411165389-21276-2-git-send-email-vyasevic@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1411165389-21276-1-git-send-email-vyasevic@redhat.com> References: <1411165389-21276-1-git-send-email-vyasevic@redhat.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org TG3 appears to have an issue performing TSO and checksum offloading correctly when the frame has been vlan encapsulated (non-accelerated). In these cases, tcp checksum is not correctly updated. This patch attempts to work around this issue. After the patch, 802.1ad vlans start working correctly over tg3 devices. CC: Prashant Sreedharan CC: Michael Chan Signed-off-by: Vladislav Yasevich --- v2: - Moved segmentation call sooner - Preserve checksum txd flag for LSO. drivers/net/ethernet/broadcom/tg3.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index cb77ae9..b78d043 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7924,6 +7924,13 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) if (skb_cow_head(skb, 0)) goto drop; + /* HW/FW can not correctly segment packets that have been + * vlan encapsulated. + */ + if (skb->protocol == htons(ETH_P_8021Q) || + skb->protocol == htons(ETH_P_8021AD)) + return tg3_tso_bug(tp, tnapi, txq, skb); + iph = ip_hdr(skb); tcp_opt_len = tcp_optlen(skb); @@ -7979,6 +7986,16 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) base_flags |= tsflags << 12; } } + } else if (skb->ip_summed == CHECKSUM_PARTIAL) { + /* HW/FW can not correctly checksum packets that have been + * vlan encapsulated. + */ + if (skb->protocol == htons(ETH_P_8021Q) || + skb->protocol == htons(ETH_P_8021AD)) { + if (skb_checksum_help(skb)) + goto drop; + base_flags &= ~TXD_FLAG_TCPUDP_CSUM; + } } if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&