117 lines
4.1 KiB
Diff
117 lines
4.1 KiB
Diff
From 0585219f59a01f01b116e47a9cd5b90bf6bba025 Mon Sep 17 00:00:00 2001
|
|
From: Hao Chen <chenhao288@hisilicon.com>
|
|
Date: Sat, 26 Mar 2022 17:51:00 +0800
|
|
Subject: [PATCH 270/283] net: hns3: fix ethtool tx copybreak buf size
|
|
indicating not aligned issue
|
|
|
|
mainline inclusion
|
|
from mainline-v5.18-rc1
|
|
commit 8778372118023e2258612c03573c47efef41d755
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN49
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8778372118023e2258612c03573c47efef41d755
|
|
|
|
--------------------------------
|
|
|
|
When use ethtoool set tx copybreak buf size to a large value
|
|
which causes order exceeding 10 or memory is not enough,
|
|
it causes allocating tx copybreak buffer failed and print
|
|
"the active tx spare buf is 0, not enabled tx spare buffer",
|
|
however, use --get-tunable parameter query tx copybreak buf
|
|
size and it indicates setting value not 0.
|
|
|
|
So, it's necessary to change the print value from setting
|
|
value to 0.
|
|
|
|
Set kinfo.tx_spare_buf_size to 0 when set tx copybreak buf size failed.
|
|
|
|
Fixes: e445f08af2b1 ("net: hns3: add support to set/get tx copybreak buf size via ethtool for hns3 driver")
|
|
Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
.../net/ethernet/hisilicon/hns3/hns3_enet.c | 20 +++++++++++--------
|
|
.../ethernet/hisilicon/hns3/hns3_ethtool.c | 3 ++-
|
|
2 files changed, 14 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
index 18d0a218040a..f9dacf01ddd6 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
@@ -736,13 +736,12 @@ static bool hns3_can_use_tx_sgl(struct hns3_enet_ring *ring,
|
|
|
|
static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)
|
|
{
|
|
+ u32 alloc_size = ring->tqp->handle->kinfo.tx_spare_buf_size;
|
|
struct hns3_tx_spare *tx_spare;
|
|
struct page *page;
|
|
- u32 alloc_size;
|
|
dma_addr_t dma;
|
|
int order;
|
|
|
|
- alloc_size = ring->tqp->handle->kinfo.tx_spare_buf_size;
|
|
if (!alloc_size)
|
|
return;
|
|
|
|
@@ -752,30 +751,35 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)
|
|
if (!tx_spare) {
|
|
/* The driver still work without the tx spare buffer */
|
|
dev_warn(ring_to_dev(ring), "failed to allocate hns3_tx_spare\n");
|
|
- return;
|
|
+ goto devm_kzalloc_error;
|
|
}
|
|
|
|
page = alloc_pages_node(dev_to_node(ring_to_dev(ring)),
|
|
GFP_KERNEL, order);
|
|
if (!page) {
|
|
dev_warn(ring_to_dev(ring), "failed to allocate tx spare pages\n");
|
|
- devm_kfree(ring_to_dev(ring), tx_spare);
|
|
- return;
|
|
+ goto alloc_pages_error;
|
|
}
|
|
|
|
dma = dma_map_page(ring_to_dev(ring), page, 0,
|
|
PAGE_SIZE << order, DMA_TO_DEVICE);
|
|
if (dma_mapping_error(ring_to_dev(ring), dma)) {
|
|
dev_warn(ring_to_dev(ring), "failed to map pages for tx spare\n");
|
|
- put_page(page);
|
|
- devm_kfree(ring_to_dev(ring), tx_spare);
|
|
- return;
|
|
+ goto dma_mapping_error;
|
|
}
|
|
|
|
tx_spare->dma = dma;
|
|
tx_spare->buf = page_address(page);
|
|
tx_spare->len = PAGE_SIZE << order;
|
|
ring->tx_spare = tx_spare;
|
|
+ return;
|
|
+
|
|
+dma_mapping_error:
|
|
+ put_page(page);
|
|
+alloc_pages_error:
|
|
+ devm_kfree(ring_to_dev(ring), tx_spare);
|
|
+devm_kzalloc_error:
|
|
+ ring->tqp->handle->kinfo.tx_spare_buf_size = 0;
|
|
}
|
|
|
|
/* Use hns3_tx_spare_space() to make sure there is enough buffer
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
|
|
index a6f339c6046d..8ac71b53ddf0 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
|
|
@@ -1879,7 +1879,8 @@ static int hns3_set_tunable(struct net_device *netdev,
|
|
old_tx_spare_buf_size = h->kinfo.tx_spare_buf_size;
|
|
new_tx_spare_buf_size = *(u32 *)data;
|
|
ret = hns3_set_tx_spare_buf_size(netdev, new_tx_spare_buf_size);
|
|
- if (ret) {
|
|
+ if (ret ||
|
|
+ (!priv->ring->tx_spare && new_tx_spare_buf_size != 0)) {
|
|
int ret1;
|
|
|
|
netdev_warn(netdev,
|
|
--
|
|
2.34.1
|
|
|