sfc: fix deadlock in RSS config read
Subsystems (3)
PATCH 1/1 sfc: fix deadlock in RSS config read
From: Edward Cree <[email protected]>
Since cited commit, core locks the net_device's rss_lock when handling
ethtool -x command, so driver's implementation should not lock it again. Remove the latter.
Fixes 040cef30b5e6 ("net: ethtool: move get_rxfh callback under the rss_lock")
Reported-by Damir Mansurov <[email protected]>
Suggested-by Ben Hutchings <[email protected]>
Signed-off-by Edward Cree <[email protected]>
--- drivers/net/ethernet/sfc/mcdi_filters.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/ethernet/sfc/mcdi_filters.c +1 -6
@@ -2182,12 +2182,7 @@ int efx_mcdi_rx_pull_rss_context_config(struct efx_nic *efx,int efx_mcdi_rx_pull_rss_config (struct efx_nic *efx) { -int rc; - -mutex_lock (&efx->net_dev->ethtool->rss_lock); - rc =efx_mcdi_rx_pull_rss_context_config (efx, &efx->rss_context); -mutex_unlock (&efx->net_dev->ethtool->rss_lock); -return rc; +return efx_mcdi_rx_pull_rss_context_config (efx, &efx->rss_context); }void efx_mcdi_rx_restore_rss_contexts (struct efx_nic *efx)
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Fri, 23 Jan 2026 16:16:34 +0000 you wrote:
From: Edward Cree <[email protected]>
Since cited commit, core locks the net_device's
rss_lockwhen handling
ethtool -x command, so driver's implementation should not lock it again. Remove the latter.
Quoted 7 lines
Fixes 040cef30b5e6 ("net: ethtool: move get_rxfh callback under the rss_lock")Reported-by Damir Mansurov <[email protected]>Suggested-by Ben Hutchings <[email protected]>Signed-off-by Edward Cree <[email protected]>[...]
Here is the summary with links:
- [net] sfc: fix deadlock in RSS config read
https://git.kernel.org/netdev/net/c/944c614b0a7a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html