From patchwork Mon Apr 10 17:44:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 97202 Delivered-To: patch@linaro.org Received: by 10.182.246.10 with SMTP id xs10csp1456498obc; Mon, 10 Apr 2017 10:45:56 -0700 (PDT) X-Received: by 10.84.171.129 with SMTP id l1mr33063459plb.5.1491846356564; Mon, 10 Apr 2017 10:45:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w21si14197944pgh.90.2017.04.10.10.45.56; Mon, 10 Apr 2017 10:45:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753529AbdDJRpe (ORCPT + 5 others); Mon, 10 Apr 2017 13:45:34 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:36019 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752314AbdDJRpb (ORCPT ); Mon, 10 Apr 2017 13:45:31 -0400 Received: by mail-pf0-f181.google.com with SMTP id o126so36634168pfb.3 for ; Mon, 10 Apr 2017 10:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ci+48rNPC3O4fb9iv9C0F/GoNwbg9ni8wQNpnXba7mo=; b=gENTgsjg53dVTXzIKhAb7zypcDZo457z2ojykRAkPfndUAs1Jq12pUhPsE3LXGa392 q/VP8LcTcWzhSWetbHfSJhuI8TtOwdfeACR3Z0yE13Hx587iIc/jcNpcxt+FHUMN5vtl VPANg0kBMloBGeJKCxEZByeMZSs8aptve0yxc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ci+48rNPC3O4fb9iv9C0F/GoNwbg9ni8wQNpnXba7mo=; b=mzWoMieEvc6xrKp0Kqa1ty1g4S7uBMbL/t0ToRt1cgjrBkdD1bMPcFdJZVLH+4cwxk MfXk1tpkIJbfo3XdF/lCCF6RZG0dPplx+u1pgpY3t5p4o29bl7nKCHR0miVx8G79OF03 85PDYv2u1/VDgZCgnzFJrhdn+Xt7mwxzkVeC0B6TFlAu3z6XWU9KbGQ7vPy3PaSNAJke ueFuTpDgE8S3xtu+mljo51NIKjvUj3uSPYNrUcyt7/Tv7j89hIjKs+KVdiPpnK5V3KlH 58VXbJTCEdQzNN2HSqrSFp5nLae32WCN4kHGpi/MvjSDFxgY+ZL0Hwiv4GKKTcUlD9UQ UAGw== X-Gm-Message-State: AN3rC/5RJBE9XIm73DO2bCaFQ24J9Ng4qacobG7gNuikTPyVK0om1gzRRj4F3/YywL/pxhM0 X-Received: by 10.84.233.136 with SMTP id l8mr19488371plk.49.1491846325899; Mon, 10 Apr 2017 10:45:25 -0700 (PDT) Received: from phantom.lan ([106.51.225.38]) by smtp.gmail.com with ESMTPSA id y6sm768833pfa.83.2017.04.10.10.45.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Apr 2017 10:45:24 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: Thomas Falcon , "David S . Miller" , Sumit Semwal Subject: [PATCH for-4.4 06/16] ibmveth: calculate gso_segs for large packets Date: Mon, 10 Apr 2017 23:14:22 +0530 Message-Id: <1491846272-14882-7-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491846272-14882-1-git-send-email-sumit.semwal@linaro.org> References: <1491846272-14882-1-git-send-email-sumit.semwal@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Falcon [Upstream commit 94acf164dc8f1184e8d0737be7125134c2701dbe] Include calculations to compute the number of segments that comprise an aggregated large packet. Signed-off-by: Thomas Falcon Reviewed-by: Marcelo Ricardo Leitner Reviewed-by: Jonathan Maxwell Signed-off-by: David S. Miller Signed-off-by: Sumit Semwal [sumits: cherry-picked for 4.4.y] --- drivers/net/ethernet/ibm/ibmveth.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 855c43d..f9e4988 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -1179,7 +1179,9 @@ map_failed: static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt) { + struct tcphdr *tcph; int offset = 0; + int hdr_len; /* only TCP packets will be aggregated */ if (skb->protocol == htons(ETH_P_IP)) { @@ -1206,14 +1208,20 @@ static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt) /* if mss is not set through Large Packet bit/mss in rx buffer, * expect that the mss will be written to the tcp header checksum. */ + tcph = (struct tcphdr *)(skb->data + offset); if (lrg_pkt) { skb_shinfo(skb)->gso_size = mss; } else if (offset) { - struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset); - skb_shinfo(skb)->gso_size = ntohs(tcph->check); tcph->check = 0; } + + if (skb_shinfo(skb)->gso_size) { + hdr_len = offset + tcph->doff * 4; + skb_shinfo(skb)->gso_segs = + DIV_ROUND_UP(skb->len - hdr_len, + skb_shinfo(skb)->gso_size); + } } static int ibmveth_poll(struct napi_struct *napi, int budget)