netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peng Li <lipeng321@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linuxarm@huawei.com>, <salil.mehta@huawei.com>,
	<lipeng321@huawei.com>
Subject: [PATCH net-next 05/12] net: hns3: fix rx path skb->truesize reporting bug
Date: Sat, 10 Mar 2018 11:29:26 +0800	[thread overview]
Message-ID: <1520652573-75644-6-git-send-email-lipeng321@huawei.com> (raw)
In-Reply-To: <1520652573-75644-1-git-send-email-lipeng321@huawei.com>

Original skb->truesize reports the received packet size,
not the actual buffer size NIC driver allocated(1 Page).
The linux net protocol will misjudge the true size of rx queue.

Signed-off-by: Peng Li <lipeng321@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 4dba974..94f0b92 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2080,15 +2080,13 @@ static void hns3_nic_reuse_page(struct sk_buff *skb, int i,
 	desc = &ring->desc[ring->next_to_clean];
 	size = le16_to_cpu(desc->rx.size);
 
-	if (twobufs) {
-		truesize = hnae_buf_size(ring);
-	} else {
-		truesize = ALIGN(size, L1_CACHE_BYTES);
+	truesize = hnae_buf_size(ring);
+
+	if (!twobufs)
 		last_offset = hnae_page_size(ring) - hnae_buf_size(ring);
-	}
 
 	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()))
-- 
2.9.3

  parent reply	other threads:[~2018-03-10  3:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-10  3:29 [PATCH net-next 00/12] fix some bugs for HNS3 driver Peng Li
2018-03-10  3:29 ` [PATCH net-next 01/12] net: hns3: add existence check when remove old uc mac address Peng Li
2018-03-10  3:29 ` [PATCH net-next 02/12] net: hns3: fix for netdev not running problem after calling net_stop and net_open Peng Li
2018-03-10  3:29 ` [PATCH net-next 03/12] net: hns3: fix for ipv6 address loss problem after setting channels Peng Li
2018-03-10  3:29 ` [PATCH net-next 04/12] net: hns3: unify the pause params setup function Peng Li
2018-03-10  3:29 ` Peng Li [this message]
2018-03-10  3:29 ` [PATCH net-next 06/12] net: hns3: add support for querying pfc puase packets statistic Peng Li
2018-03-10  3:29 ` [PATCH net-next 07/12] net: hns3: fix for loopback failure when vlan filter is enable Peng Li
2018-03-10  3:29 ` [PATCH net-next 08/12] net: hns3: fix for buffer overflow smatch warning Peng Li
2018-03-10  3:29 ` [PATCH net-next 09/12] net: hns3: fix error type definition of return value Peng Li
2018-03-10  3:29 ` [PATCH net-next 10/12] net: hns3: fix return value error of hclge_get_mac_vlan_cmd_status() Peng Li
2018-03-10  3:29 ` [PATCH net-next 11/12] net: hns3: add existence checking before adding unicast mac address Peng Li
2018-03-10  3:29 ` [PATCH net-next 12/12] net: hns3: add result checking for VF when modify " Peng Li
2018-03-12  2:54 ` [PATCH net-next 00/12] fix some bugs for HNS3 driver David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1520652573-75644-6-git-send-email-lipeng321@huawei.com \
    --to=lipeng321@huawei.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=netdev@vger.kernel.org \
    --cc=salil.mehta@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).