Skip to contentSkip to conversation

sfc: falcon: refactor and document ef4_ethtool_get_rxfh_fields

PATCH Applied [email protected] 2 participants 2 messages Jul 10, 2025 – Jul 11, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sfc: falcon: refactor and document ef4_ethtool_get_rxfh_fields

From: Edward Cree <[email protected]>

The code had some rather odd control flow inherited from when it was
shared with siena and ef10 before this driver was split out.
Simplify that for easier reading.
Also add a comment explaining why we return the values we do, since
some Falcon documents and datasheets confusingly mention the part supporting 4-tuple UDP hashing.
(I couldn't find any record of exactly what was "broken" about the
original Falcon A hash, I'm just trusting that falcon_init_rx_cfg() had a good reason for not using it.)

---
 drivers/net/ethernet/sfc/falcon/ethtool.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/sfc/falcon/ethtool.c +8 -4
index 6685e71ab13f..27d1cd6f24ca 100644
@@ -948,9 +948,16 @@ ef4_ethtool_get_rxfh_fields(struct net_device *net_dev,
 			    struct ethtool_rxfh_fields *info)
 {
 	struct ef4_nic *efx = netdev_priv(net_dev);
-	unsigned int min_revision = 0;
 
 	info->data = 0;
+	/* Falcon A0 and A1 had a 4-tuple hash for TCP and UDP, but it was
+	 * broken so we do not enable it.
+	 * Falcon B0 adds a Toeplitz hash, 4-tuple for TCP and 2-tuple for
+	 * other IPv4, including UDP.
+	 * See falcon_init_rx_cfg().
+	 */
+	if (ef4_nic_rev(efx) < EF4_REV_FALCON_B0)
+		return 0;
 	switch (info->flow_type) {
 	case TCP_V4_FLOW:
 		info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
@@ -960,13 +967,10 @@ ef4_ethtool_get_rxfh_fields(struct net_device *net_dev,
 	case AH_ESP_V4_FLOW:
 	case IPV4_FLOW:
 		info->data |= RXH_IP_SRC | RXH_IP_DST;
-		min_revision = EF4_REV_FALCON_B0;
 		break;
 	default:
 		break;
 	}
-	if (ef4_nic_rev(efx) < min_revision)
-		info->data = 0;
 	return 0;
 }
 
#1 lore raw
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 12 lines · On Thu, 10 Jul 2025 18:32:13 +0100 you wrote:

From: Edward Cree <[email protected]>

The code had some rather odd control flow inherited from when it was
shared with siena and ef10 before this driver was split out.
Simplify that for easier reading.
Also add a comment explaining why we return the values we do, since
some Falcon documents and datasheets confusingly mention the part supporting 4-tuple UDP hashing.
(I couldn't find any record of exactly what was "broken" about the
original Falcon A hash, I'm just trusting that falcon_init_rx_cfg() had a good reason for not using it.)

Quoted 1 line

[...]

Here is the summary with links:
- [net-next] sfc: falcon: refactor and document ef4_ethtool_get_rxfh_fields

    https://git.kernel.org/netdev/net-next/c/4159a55f29e1

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html