From patchwork Mon Apr 29 19:00:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44tDWl3Nm7z9sB8; Tue, 30 Apr 2019 05:00:50 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hLBWA-0002gB-06; Mon, 29 Apr 2019 19:00:46 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hLBW8-0002fB-C7 for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 19:00:44 +0000 Received: from mail-it1-f200.google.com ([209.85.166.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hLBW8-00048N-1q for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 19:00:44 +0000 Received: by mail-it1-f200.google.com with SMTP id f196so409709itf.1 for ; Mon, 29 Apr 2019 12:00:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4EZMhU9eJWOq1B7k8466ConFf+OuseJh6iwQPt7Gg5U=; b=V9J90/kKqzxzaqBas+BZRM3YZsVhFgWl42qDUg0cQ+fnEOeUOpeTKmPPPFEbJiHMzV 46fluVdRJbcXgZw6vC4exraSaf56WSTQuLEziTk0TcA9W5RZzaIcW3vgUSt7EYm/mHks DeSp2SHOwjIQ7FL2DXkv/48TrzOP9DWAYXgAyV3WVo1ij3XYc8GEolPz9Dgg/ykTvGtq X8+wVNO/ZaKrBrK3SbCGlLBf1Oa53oSZfzScQGUUHoP2Zi3BKKT49Jxcv+kNThfdwQXz RQmDAaUG++gyM2s1ObE0q2/KmmscH4G1TdYSh8OtOXfQwddQZnWy9UDrEcsYiNPlKQwe koeQ== X-Gm-Message-State: APjAAAV+GGBMYOI0hYZgRzxdirh0NLMeGWLa3QVmXy8vib3xSl3tiQuI FbmjjicWDx7f4jYJs6bfbJ18/Vg0yzLwJrblZhlh6IK/K3VlvJHyrRT03TrKlLpEGihgi5sDQag d802fPncoouJ8BGukp3pzVFLkunIofBzsr9YttuImVQ== X-Received: by 2002:a24:1c9:: with SMTP id 192mr516861itk.60.1556564442835; Mon, 29 Apr 2019 12:00:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1xwOVrxL69uXCrslR+5VZTMAo6T4ThGneUnZXgzABgWfGCBIvSL0fmog5lV3cwCylhQpLJQ== X-Received: by 2002:a24:1c9:: with SMTP id 192mr516832itk.60.1556564442405; Mon, 29 Apr 2019 12:00:42 -0700 (PDT) Received: from xps13.canonical.com (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id y6sm10359605iom.71.2019.04.29.12.00.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 12:00:41 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH][SRU Bionic] net: hns: fix skb->truesize underestimation Date: Mon, 29 Apr 2019 13:00:34 -0600 Message-Id: <20190429190034.17818-1-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Huazhong Tan BugLink: https://bugs.launchpad.net/bugs/1826911 skb->truesize is not meant to be tracking amount of used bytes in a skb, but amount of reserved/consumed bytes in memory. For instance, if we use a single byte in last page fragment, we have to account the full size of the fragment. So skb_add_rx_frag needs to calculate the length of the entire buffer into turesize. Fixes: 9cbe9fd5214e ("net: hns: optimize XGE capability by reducing cpu usage") Signed-off-by: Huazhong tan Signed-off-by: Salil Mehta Signed-off-by: David S. Miller (cherry picked from commit b1ccd4c0ab6ef499f47dd84ed4920502a7147bba) Signed-off-by: dann frazier Acked-by: Kleber Sacilotto de Souza --- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c index ae860fe49d77e..e8511ef794b90 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c @@ -430,7 +430,7 @@ static void hns_nic_reuse_page(struct sk_buff *skb, int i, } skb_add_rx_frag(skb, i, desc_cb->priv, desc_cb->page_offset + pull_len, - size - pull_len, truesize - pull_len); + size - pull_len, truesize); /* avoid re-using remote pages,flag default unreuse */ if (unlikely(page_to_nid(desc_cb->priv) != numa_node_id()))