From patchwork Wed Mar 23 20:01:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Gynther X-Patchwork-Id: 601356 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 3qVgT94blTz9sBG for ; Thu, 24 Mar 2016 07:02:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=dz+/IxQn; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756554AbcCWUCT (ORCPT ); Wed, 23 Mar 2016 16:02:19 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:32878 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752206AbcCWUCS (ORCPT ); Wed, 23 Mar 2016 16:02:18 -0400 Received: by mail-pf0-f171.google.com with SMTP id 4so38627706pfd.0 for ; Wed, 23 Mar 2016 13:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TXI/QPAMfA961k/5lH0S4zBLvFBvXeP9dtFTwDQKq5A=; b=dz+/IxQnt8GL1Sux2fVCkAp6/lUq/OMvJLpB6uhgsOHMSneoaS0GHKTOsGoNe4/BAm NKlu4cQ+xujLll8+2LvB6gtmN4plMKGNKldLX4q80YN1eV08Xmywl39u0myv65dYpeR5 79e2TIydeftnPv4AvjcwmsiTzJb1qeIqsB/JuL7QdkzITcQUsAfnZnCXuzW+XLMdEfgK Ehy9SezePPHtAvzxALixQdWL5br2wIgWvL43Y8LNO+1/c/AZHRWwP2J6ywBEKGAxgN2S QI3vQyEX+12ETd1dBm+AjJgwsQUiF9dOFyEKkhbAZj3B+uEfrnWjTrpJD9Jux1K3O+Ez /nnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TXI/QPAMfA961k/5lH0S4zBLvFBvXeP9dtFTwDQKq5A=; b=AJdmwzGG4WxYeIesVOpOlbOwh1vvTfBBRNVC1Ustzw+tEPTeUmtrL8FOe3i3AelEwb HaUPPOKBerdxQlz32+HhFoqmTJmDMmpJ0V5HsJ6OPw4p5CZahb6ODHw3bMWUMn7dmERF 4DWFilJfEfXu7jJPt5tOFW06iAn8PQ72nCZN1DSXPwQaQr+Ygt7GSi6zSiu435d94kHi HNgWHmauMZR4WoIrFzd6Py0r/cwHajLyQ9xO8pxUMOMsTcDNDo9Q5yZu/9l0Qb6j7Umg BNQk23DSqjlXKcoSIr+doN2TQcK83qRhkYZ5Piisy873xmIwfXorxdEHo8lApy+9q/AV IRWg== X-Gm-Message-State: AD7BkJKtgOp4D5wvJDgywaQ2hHvNevLE+vVmZqo/DdHHnOvnKq7IMoNfySczS5q5qeYYxkYZ X-Received: by 10.98.80.10 with SMTP id e10mr6874645pfb.141.1458763337901; Wed, 23 Mar 2016 13:02:17 -0700 (PDT) Received: from slapshot.mtv.corp.google.com ([172.27.88.51]) by smtp.gmail.com with ESMTPSA id ux2sm6026386pac.46.2016.03.23.13.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Mar 2016 13:02:17 -0700 (PDT) From: Petri Gynther To: netdev@vger.kernel.org Cc: davem@davemloft.net, f.fainelli@gmail.com, jaedon.shin@gmail.com, edumazet@google.com, Petri Gynther Subject: [PATCH net 2/2] net: bcmgenet: fix skb_len in bcmgenet_xmit_single() Date: Wed, 23 Mar 2016 13:01:29 -0700 Message-Id: <1458763289-95167-2-git-send-email-pgynther@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1458763289-95167-1-git-send-email-pgynther@google.com> References: <1458763289-95167-1-git-send-email-pgynther@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb_len needs to be skb_headlen(skb) in bcmgenet_xmit_single(). Fragmented skbs can have only Ethernet + IP + TCP headers (14+20+20=54 bytes) in the linear buffer, followed by the rest in fragments. Bumping skb_len to ETH_ZLEN would be incorrect for this case, as it would introduce garbage between TCP header and the fragment data. This also works with regular/non-fragmented small packets < ETH_ZLEN bytes. Successfully tested this on GENETv3 with 42-byte ARP frames. For testing, I used: ethtool -K eth0 tx-checksum-ipv4 off ethtool -K eth0 tx-checksum-ipv6 off echo 0 > /proc/sys/net/ipv4/tcp_timestamps Signed-off-by: Petri Gynther Acked-by: Eric Dumazet --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 9990582..00da239 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1298,7 +1298,7 @@ static int bcmgenet_xmit_single(struct net_device *dev, tx_cb_ptr->skb = skb; - skb_len = skb_headlen(skb) < ETH_ZLEN ? ETH_ZLEN : skb_headlen(skb); + skb_len = skb_headlen(skb); mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE); ret = dma_mapping_error(kdev, mapping);