Commit 944c614b authored by Edward Cree's avatar Edward Cree Committed by Jakub Kicinski
Browse files

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: 040cef30 ("net: ethtool: move get_rxfh callback under the rss_lock")
Reported-by: default avatarDamir Mansurov <damir.mansurov@oktetlabs.ru>
Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1126015


Suggested-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Link: https://patch.msgid.link/20260123161634.1215006-1-edward.cree@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f66f5c21

drivers/net/ethernet/sfc/mcdi_filters.c

+1 −6
Original line number Diff line number Diff line
@@ -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)