lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 058/757] sfc: move initialisation of efx->filter_sem to efx_init_struct()
    Date
    From: Edward Cree <ecree@solarflare.com>

    [ 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@solarflare.com>
    Link: https://lore.kernel.org/r/24fad43e-887d-051e-25e3-506f23f63abf@solarflare.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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);

    \
     
     \ /
      Last update: 2020-10-27 16:34    [W:4.046 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site