78 lines
2.9 KiB
Diff
78 lines
2.9 KiB
Diff
From e76635fec8f1ec43ceddda52fac7ff36ee4052f3 Mon Sep 17 00:00:00 2001
|
|
From: Yunsheng Lin <linyunsheng@huawei.com>
|
|
Date: Sat, 23 Feb 2019 17:22:09 +0800
|
|
Subject: [PATCH 225/283] net: hns3: avoid mult + div op in critical data path
|
|
|
|
mainline inclusion
|
|
from mainline-v5.1-rc1
|
|
commit 3fe13ed95dd3c4aede3313a2dd2d589c207b51d0
|
|
category: cleanup
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN49
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3fe13ed95dd3c4aede3313a2dd2d589c207b51d0
|
|
|
|
--------------------------------
|
|
|
|
This patch uses shift offset to avoid doing mult and div operation.
|
|
|
|
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +++--
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 +++
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
index 3066d7e960de..303b7b76bc8d 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
@@ -913,6 +913,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen_fdop_ol4cs,
|
|
|
|
/* normal or tunnel packet */
|
|
l4_offset = l4.hdr - skb->data;
|
|
+ hdr_len = (l4.tcp->doff << 2) + l4_offset;
|
|
|
|
/* remove payload length from inner pseudo checksum when tso */
|
|
l4_paylen = skb->len - l4_offset;
|
|
@@ -1466,8 +1467,8 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, dma_addr_t dma,
|
|
return HNS3_LIKELY_BD_NUM;
|
|
}
|
|
|
|
- frag_buf_num = hns3_tx_bd_count(size);
|
|
- sizeoflast = size % HNS3_MAX_BD_SIZE;
|
|
+ frag_buf_num = (size + HNS3_MAX_BD_SIZE - 1) >> HNS3_MAX_BD_SIZE_OFFSET;
|
|
+ sizeoflast = size & HNS3_TX_LAST_SIZE_M;
|
|
sizeoflast = sizeoflast ? sizeoflast : HNS3_MAX_BD_SIZE;
|
|
|
|
/* When frag size is bigger than hardware limit, split this frag */
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
index 74a48d3a61b3..163f7cdadd54 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
@@ -185,6 +185,8 @@ enum hns3_nic_state {
|
|
#define HNS3_TXD_MSS_M (0x3fff << HNS3_TXD_MSS_S)
|
|
#define HNS3_TXD_HW_CS_B 14
|
|
|
|
+#define HNS3_TX_LAST_SIZE_M 0xffff
|
|
+
|
|
#define HNS3_VECTOR_TX_IRQ BIT_ULL(0)
|
|
#define HNS3_VECTOR_RX_IRQ BIT_ULL(1)
|
|
|
|
@@ -196,6 +198,7 @@ enum hns3_nic_state {
|
|
#define HNS3_MAX_TSO_BD_NUM 63U
|
|
#define HNS3_MAX_TSO_SIZE 1048576U
|
|
#define HNS3_MAX_NON_TSO_SIZE 9728U
|
|
+#define HNS3_MAX_BD_SIZE_OFFSET 16
|
|
|
|
#define HNS3_VECTOR_GL0_OFFSET 0x100
|
|
#define HNS3_VECTOR_GL1_OFFSET 0x200
|
|
--
|
|
2.34.1
|
|
|