This is a note to let you know that I've just added the patch titled [PATCH stable 5.9 30/30] sfc: move initialisation of efx->filter_sem to efx_init_struct() to the 5.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sfc-move-initialisation-of-efx-filter_sem-to-efx_init_struct.patch and it can be found in the queue-5.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Sat Oct 24 10:56:06 AM CEST 2020 From: Edward Cree <ecree@xxxxxxxxxxxxxx> Date: Tue, 20 Oct 2020 15:35:08 +0100 Subject: [PATCH stable 5.9 30/30] sfc: move initialisation of efx->filter_sem to efx_init_struct() From: Edward Cree <ecree@xxxxxxxxxxxxxx> [ Upstream commit 05f90bf3d5df40e1a705527520e5fd56b2b6f09e ] efx_probe_filters() has not been called yet when EF100 calls into efx_mcdi_filter_table_probe(), for which it wants to take the filter_sem. Fixes: a9dc3d5612ce ("sfc_ef100: RX filter table management and related gubbins") Signed-off-by: Edward Cree <ecree@xxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/24fad43e-887d-051e-25e3-506f23f63abf@xxxxxxxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/sfc/efx_common.c | 1 + drivers/net/ethernet/sfc/rx_common.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/sfc/efx_common.c +++ b/drivers/net/ethernet/sfc/efx_common.c @@ -1030,6 +1030,7 @@ int efx_init_struct(struct efx_nic *efx, efx->num_mac_stats = MC_CMD_MAC_NSTATS; BUILD_BUG_ON(MC_CMD_MAC_NSTATS - 1 != MC_CMD_MAC_GENERATION_END); mutex_init(&efx->mac_lock); + init_rwsem(&efx->filter_sem); #ifdef CONFIG_RFS_ACCEL mutex_init(&efx->rps_mutex); spin_lock_init(&efx->rps_hash_lock); --- a/drivers/net/ethernet/sfc/rx_common.c +++ b/drivers/net/ethernet/sfc/rx_common.c @@ -797,7 +797,6 @@ int efx_probe_filters(struct efx_nic *ef { int rc; - init_rwsem(&efx->filter_sem); mutex_lock(&efx->mac_lock); down_write(&efx->filter_sem); rc = efx->type->filter_table_probe(efx); Patches currently in stable-queue which might be from ecree@xxxxxxxxxxxxxx are queue-5.9/sfc-move-initialisation-of-efx-filter_sem-to-efx_init_struct.patch