| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230331092344.268981-1-vinschen@redhat.com>
Date: Fri, 31 Mar 2023 11:23:44 +0200
From: Corinna Vinschen <vinschen@...hat.com>
To: Giuseppe Cavallaro <peppe.cavallaro@...com>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Jose Abreu <joabreu@...opsys.com>, netdev@...r.kernel.org
Subject: [PATCH net-next] net: stmmac: publish actual MTU restriction
Apart from devices setting the max MTU value from device tree,
the initialization functions in many drivers use a default value
of JUMBO_LEN.
However, that doesn't reflect reality. The stmmac_change_mtu
function restricts the MTU to the size of a single queue in the TX
FIFO.
For instance, on st_gmac without device tree this is by default 4096.
And so this is what you get:
# ip -d link show dev enp0s29f1
2: enp0s29f1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 98:4f:ee:16:11:99 brd ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 46 maxmtu 9000 [...etc...]
So maxmtu is set to 9000, but then:
# ip link set enp0s29f1 mtu 4096
# ip link set enp0s29f1 mtu 4097
RTNETLINK answers: Invalid argument
Change code accordingly by not setting maxmtu to JUMBO_LEN by default.
Instead, after all is set and done, let stmmac_dvr_probe set maxmtu
according to the queue size, if it hasn't been already set via device
tree.
The only exception from this rule is dwmac-mediatek, setting maxmtu to
ETH_DATA_LEN, which should be kept intact.
Result now:
# ip link set enp0s29f1 mtu 4096
# ip link set enp0s29f1 mtu 4097
Error: mtu greater than device maximum.
Tested on Intel Elkhart Lake system.
Fixes: 2618abb73c895 ("stmmac: Fix kernel crashes for jumbo frames")
Fixes: a2cd64f30140c ("net: stmmac: fix maxmtu assignment to be within valid range")
Fixes: ebecb860ed228 ("net: stmmac: pci: Add HAPS support using GMAC5")
Fixes: 58da0cfa6cf12 ("net: stmmac: create dwmac-intel.c to contain all Intel platform")
Fixes: 30bba69d7db40 ("stmmac: pci: Add dwmac support for Loongson")
Signed-off-by: Corinna Vinschen <vinschen@...hat.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 6 ------
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 3 ---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +++++++++
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 6 ------
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 -----
5 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index 13aa919633b4..2912685b481c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -430,9 +430,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
/* Set default value for unicast filter entries */
plat->unicast_filter_entries = 1;
- /* Set the maxmtu to a default of JUMBO_LEN */
- plat->maxmtu = JUMBO_LEN;
-
/* Set default number of RX and TX queues to use */
plat->tx_queues_to_use = 1;
plat->rx_queues_to_use = 1;
@@ -559,9 +556,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
/* Set default value for unicast filter entries */
plat->unicast_filter_entries = 1;
- /* Set the maxmtu to a default of JUMBO_LEN */
- plat->maxmtu = JUMBO_LEN;
-
plat->vlan_fail_q_en = true;
/* Use the last Rx queue */
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index a25c187d3185..ec90c925ad33 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -21,9 +21,6 @@ static int loongson_default_data(struct plat_stmmacenet_data *plat)
/* Set default value for unicast filter entries */
plat->unicast_filter_entries = 1;
- /* Set the maxmtu to a default of JUMBO_LEN */
- plat->maxmtu = JUMBO_LEN;
-
/* Set default number of RX and TX queues to use */
plat->tx_queues_to_use = 1;
plat->rx_queues_to_use = 1;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 17310ade88dd..c5e74097d9ab 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7246,6 +7246,15 @@ int stmmac_dvr_probe(struct device *device,
ndev->max_mtu = JUMBO_LEN;
else
ndev->max_mtu = SKB_MAX_HEAD(NET_SKB_PAD + NET_IP_ALIGN);
+
+ /* stmmac_change_mtu restricts MTU to queue size.
+ * Set maxmtu accordingly, if it hasn't been set from DT.
+ */
+ if (priv->plat->maxmtu == 0) {
+ priv->plat->maxmtu = priv->plat->tx_fifo_size ?:
+ priv->dma_cap.tx_fifo_size;
+ priv->plat->maxmtu /= priv->plat->tx_queues_to_use;
+ }
/* Will not overwrite ndev->max_mtu if plat->maxmtu > ndev->max_mtu
* as well as plat->maxmtu < ndev->min_mtu which is a invalid range.
*/
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 644bb54f5f02..b3bb0c174b8b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -33,9 +33,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
/* Set default value for unicast filter entries */
plat->unicast_filter_entries = 1;
- /* Set the maxmtu to a default of JUMBO_LEN */
- plat->maxmtu = JUMBO_LEN;
-
/* Set default number of RX and TX queues to use */
plat->tx_queues_to_use = 1;
plat->rx_queues_to_use = 1;
@@ -86,9 +83,6 @@ static int snps_gmac5_default_data(struct pci_dev *pdev,
/* Set default value for unicast filter entries */
plat->unicast_filter_entries = 1;
- /* Set the maxmtu to a default of JUMBO_LEN */
- plat->maxmtu = JUMBO_LEN;
-
/* Set default number of RX and TX queues to use */
plat->tx_queues_to_use = 4;
plat->rx_queues_to_use = 4;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 067a40fe0a23..857411105a0a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -468,11 +468,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
plat->en_tx_lpi_clockgating =
of_property_read_bool(np, "snps,en-tx-lpi-clockgating");
- /* Set the maxmtu to a default of JUMBO_LEN in case the
- * parameter is not present in the device tree.
- */
- plat->maxmtu = JUMBO_LEN;
-
/* Set default value for multicast hash bins */
plat->multicast_filter_bins = HASH_TABLE_SIZE;
--
2.39.2
Powered by blists - more mailing lists