net: ftmac100: prepare data path for receiving single segment packets > 1514
Subsystems (2)
PATCH 1/3 net: ftmac100: prepare data path for receiving single segment packets > 1514
From: Vladimir Oltean <[email protected]>
Eliminate one check in the data path and move it elsewhere, to where our real limitation is. We'll want to start processing "too long" frames in the driver (currently there is a hardware MAC setting which drops theses).
--- drivers/net/ethernet/faraday/ftmac100.c | 29 ++++++++++--------------- 1 file changed, 12 insertions(+), 17 deletions(-)
drivers/net/ethernet/faraday/ftmac100.c +12 -17
@@ -218,11 +218,6 @@ static bool ftmac100_rxdes_crc_error(struct ftmac100_rxdes *rxdes)return rxdes->rxdes0 &cpu_to_le32 (FTMAC100_RXDES0_CRC_ERR ); } -static bool ftmac100_rxdes_frame_too_long (struct ftmac100_rxdes *rxdes) -{ -return rxdes->rxdes0 &cpu_to_le32 (FTMAC100_RXDES0_FTL ); -} -static bool ftmac100_rxdes_runt (struct ftmac100_rxdes *rxdes) {return rxdes->rxdes0 &cpu_to_le32 (FTMAC100_RXDES0_RUNT );
@@ -337,13 +332,7 @@ static bool ftmac100_rx_packet_error(struct ftmac100 *priv, error = true; } -if (unlikely (ftmac100_rxdes_frame_too_long (rxdes))) { -if (net_ratelimit ()) -netdev_info (netdev,"rx frame too long\n" ); - - netdev->stats.rx_length_errors++; - error = true; - }else if (unlikely (ftmac100_rxdes_runt (rxdes))) { +if (unlikely (ftmac100_rxdes_runt (rxdes))) {if (net_ratelimit ())netdev_info (netdev,"rx runt\n" );
@@ -356,6 +345,11 @@ static bool ftmac100_rx_packet_error(struct ftmac100 *priv, netdev->stats.rx_length_errors++; error = true; } +/* +* FTMAC100_RXDES0_FTL is not an error, it just indicates that the +* frame is longer than 1518 octets. Receiving these is possible when +* we told the hardware not to drop them, via FTMAC100_MACCR_RX_FTL. +*/ return error; }
@@ -400,12 +394,13 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)return true; } -/* -* It is impossible to get multi-segment packets -* because we always provide big enough receive buffers. -*/ +/* We don't support multi-segment packets for now, so drop them. */ ret =ftmac100_rxdes_last_segment (rxdes); -BUG_ON (!ret); +if (unlikely (!ret)) { + netdev->stats.rx_length_errors++; +ftmac100_rx_drop_packet (priv); +return true; + }/* start processing */ skb =netdev_alloc_skb_ip_align (netdev,128 );
Signature · 1 line
2.34.1
PATCH 2/3 net: ftmac100: report the correct maximum MTU of 1500
From: Vladimir Oltean <[email protected]>
The driver uses the MAX_PKT_SIZE (1518) for both MTU reporting and for TX. However, the 2 places do not measure the same thing.
On TX, skb->len measures the entire L2 packet length (without FCS, which software does not possess). So the comparison against 1518 there is correct.
What is not correct is the reporting of dev->max_mtu as 1518. Since MTU measures L2 *payload* length (excluding L2 overhead) and not total L2 packet length, it means that the correct max_mtu supported by this device is the standard 1500. Anything higher than that will be dropped on RX currently.
To fix this, subtract VLAN_ETH_HLEN from MAX_PKT_SIZE when reporting the max_mtu, since that is the difference between L2 payload length and total L2 length as seen by software.
--- drivers/net/ethernet/faraday/ftmac100.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/faraday/ftmac100.c +2 -1
@@ -11,6 +11,7 @@#include <linux/dma-mapping.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> +#include <linux/if_vlan.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h>
@@ -1070,7 +1071,7 @@ static int ftmac100_probe(struct platform_device *pdev)SET_NETDEV_DEV (netdev, &pdev->dev); netdev->ethtool_ops = &ftmac100_ethtool_ops; netdev->netdev_ops = &ftmac100_netdev_ops; - netdev->max_mtu =MAX_PKT_SIZE ; + netdev->max_mtu =MAX_PKT_SIZE -VLAN_ETH_HLEN ; err =platform_get_ethdev_address (&pdev->dev, netdev);if (err == -EPROBE_DEFER )
Signature · 1 line
2.34.1
PATCH 3/3 net: ftmac100: allow increasing MTU to make most use of single-segment buffers
In reply to Sergei AntonovIf the FTMAC100 is used as a DSA master, then it is expected that frames which are MTU sized on the wire facing the external switch port (1500 octets in L2 payload, plus L2 header) also get a DSA tag when seen by the host port.
This extra tag increases the length of the packet as the host port sees it, and the FTMAC100 is not prepared to handle frames whose length exceeds 1518 octets (including FCS) at all.
Only a minimal rework is needed to support this configuration. Since MTU-sized DSA-tagged frames still fit within a single buffer (RX_BUF_SIZE), we just need to optimize the resource management rather than implement multi buffer RX.
In ndo_change_mtu(), we toggle the FTMAC100_MACCR_RX_FTL bit to tell the hardware to drop (or not) frames with an L2 payload length larger than 1500. We need to replicate the MACCR configuration in ftmac100_start_hw() as well, since there is a hardware reset there which clears previous settings.
The advantage of dynamically changing FTMAC100_MACCR_RX_FTL is that when dev->mtu is at the default value of 1500, large frames are automatically dropped in hardware and we do not spend CPU cycles dropping them.
--- drivers/net/ethernet/faraday/ftmac100.c | 33 +++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/net/ethernet/faraday/ftmac100.c +31 -2
@@ -11,6 +11,7 @@#include <linux/dma-mapping.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> +#include <linux/if_ether.h> #include <linux/if_vlan.h> #include <linux/init.h> #include <linux/interrupt.h>
@@ -28,8 +29,8 @@#define RX_QUEUE_ENTRIES 128/* must be power of 2 */ #define TX_QUEUE_ENTRIES 16/* must be power of 2 */ -#define MAX_PKT_SIZE 1518#define RX_BUF_SIZE 2044/* must be smaller than 0x7ff */ +#define MAX_PKT_SIZE RX_BUF_SIZE/* multi-segment not supported */ #if MAX_PKT_SIZE >0x7ff #error invalid MAX_PKT_SIZE
@@ -160,6 +161,7 @@ static void ftmac100_set_mac(struct ftmac100 *priv, const unsigned char *mac)static int ftmac100_start_hw (struct ftmac100 *priv) {struct net_device *netdev = priv->netdev; +unsigned int maccr =MACCR_ENABLE_ALL ;if (ftmac100_reset (priv))return -EIO ;
@@ -176,7 +178,11 @@ static int ftmac100_start_hw(struct ftmac100 *priv)ftmac100_set_mac (priv, netdev->dev_addr); -iowrite32 (MACCR_ENABLE_ALL , priv->base +FTMAC100_OFFSET_MACCR ); +/* See ftmac100_change_mtu() */ +if (netdev->mtu >ETH_DATA_LEN ) + maccr |=FTMAC100_MACCR_RX_FTL ; + +iowrite32 (maccr, priv->base +FTMAC100_OFFSET_MACCR );return 0 ; }
@@ -1033,6 +1039,28 @@ static int ftmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int creturn generic_mii_ioctl (&priv->mii, data, cmd,NULL ); } +static int ftmac100_change_mtu (struct net_device *netdev,int mtu) +{ +struct ftmac100 *priv =netdev_priv (netdev); +unsigned int maccr; + + maccr =ioread32 (priv->base +FTMAC100_OFFSET_MACCR ); +if (mtu >ETH_DATA_LEN ) { +/* process long packets in the driver */ + maccr |=FTMAC100_MACCR_RX_FTL ; + }else { +/* Let the controller drop incoming packets greater +* than 1518 (that is 1500 + 14 Ethernet + 4 FCS). +*/ + maccr &= ~FTMAC100_MACCR_RX_FTL ; + } +iowrite32 (maccr, priv->base +FTMAC100_OFFSET_MACCR ); + + netdev->mtu = mtu; + +return 0 ; +} +static const struct net_device_ops ftmac100_netdev_ops = { .ndo_open = ftmac100_open, .ndo_stop = ftmac100_stop,
@@ -1040,6 +1068,7 @@ static const struct net_device_ops ftmac100_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, .ndo_eth_ioctl = ftmac100_do_ioctl, + .ndo_change_mtu = ftmac100_change_mtu, };/******************************************************************************
Signature · 1 line
2.34.1
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Fri, 28 Oct 2022 21:32:18 +0300 you wrote:
From: Vladimir Oltean <[email protected]>
Eliminate one check in the data path and move it elsewhere, to where our real limitation is. We'll want to start processing "too long" frames in the driver (currently there is a hardware MAC setting which drops theses).
[...]
Here is the summary with links:
- [1/3] net: ftmac100: prepare data path for receiving single segment packets > 1514
https://git.kernel.org/netdev/net-next/c/55f6f3dbcf4c - [2/3] net: ftmac100: report the correct maximum MTU of 1500 https://git.kernel.org/netdev/net-next/c/30f837b7b923 - [3/3] net: ftmac100: allow increasing MTU to make most use of single-segment buffers https://git.kernel.org/netdev/net-next/c/37c8489012dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html