Skip to content

Commit 944c614

Browse files
Edward Creekuba-moo
authored andcommitted
sfc: fix deadlock in RSS config read
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: 040cef3 ("net: ethtool: move get_rxfh callback under the rss_lock") Reported-by: Damir Mansurov <damir.mansurov@oktetlabs.ru> Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1126015 Suggested-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Edward Cree <ecree.xilinx@gmail.com> Link: https://patch.msgid.link/20260123161634.1215006-1-edward.cree@amd.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent f66f5c2 commit 944c614

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

drivers/net/ethernet/sfc/mcdi_filters.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,12 +2182,7 @@ int efx_mcdi_rx_pull_rss_context_config(struct efx_nic *efx,
21822182

21832183
int efx_mcdi_rx_pull_rss_config(struct efx_nic *efx)
21842184
{
2185-
int rc;
2186-
2187-
mutex_lock(&efx->net_dev->ethtool->rss_lock);
2188-
rc = efx_mcdi_rx_pull_rss_context_config(efx, &efx->rss_context);
2189-
mutex_unlock(&efx->net_dev->ethtool->rss_lock);
2190-
return rc;
2185+
return efx_mcdi_rx_pull_rss_context_config(efx, &efx->rss_context);
21912186
}
21922187

21932188
void efx_mcdi_rx_restore_rss_contexts(struct efx_nic *efx)

0 commit comments

Comments
 (0)