lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 236/376] iwlwifi: mvm: fix aux station leak
    Date
    From: Sharon <sara.sharon@intel.com>

    [ Upstream commit f327236df2afc8c3c711e7e070f122c26974f4da ]

    When mvm is initialized we alloc aux station with aux queue.
    We later free the station memory when driver is stopped, but we
    never free the queue's memory, which casues a leak.

    Add a proper de-initialization of the station.

    Signed-off-by: Sharon <sara.sharon@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20200529092401.0121c5be55e9.Id7516fbb3482131d0c9dfb51ff20b226617ddb49@changeid
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 ++---
    drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 +++++++++++++-----
    drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 6 +++---
    3 files changed, 18 insertions(+), 11 deletions(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
    index 7aa1350b093e..cf3c46c9b1ee 100644
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
    @@ -1209,14 +1209,13 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
    */
    flush_work(&mvm->roc_done_wk);

    + iwl_mvm_rm_aux_sta(mvm);
    +
    iwl_mvm_stop_device(mvm);

    iwl_mvm_async_handlers_purge(mvm);
    /* async_handlers_list is empty and will stay empty: HW is stopped */

    - /* the fw is stopped, the aux sta is dead: clean up driver state */
    - iwl_mvm_del_aux_sta(mvm);
    -
    /*
    * Clear IN_HW_RESTART and HW_RESTART_REQUESTED flag when stopping the
    * hw (as restart_complete() won't be called in this case) and mac80211
    diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
    index 56ae72debb96..07ca8c91499d 100644
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
    @@ -2080,16 +2080,24 @@ int iwl_mvm_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
    return ret;
    }

    -void iwl_mvm_dealloc_snif_sta(struct iwl_mvm *mvm)
    +int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm)
    {
    - iwl_mvm_dealloc_int_sta(mvm, &mvm->snif_sta);
    -}
    + int ret;

    -void iwl_mvm_del_aux_sta(struct iwl_mvm *mvm)
    -{
    lockdep_assert_held(&mvm->mutex);

    + iwl_mvm_disable_txq(mvm, NULL, mvm->aux_queue, IWL_MAX_TID_COUNT, 0);
    + ret = iwl_mvm_rm_sta_common(mvm, mvm->aux_sta.sta_id);
    + if (ret)
    + IWL_WARN(mvm, "Failed sending remove station\n");
    iwl_mvm_dealloc_int_sta(mvm, &mvm->aux_sta);
    +
    + return ret;
    +}
    +
    +void iwl_mvm_dealloc_snif_sta(struct iwl_mvm *mvm)
    +{
    + iwl_mvm_dealloc_int_sta(mvm, &mvm->snif_sta);
    }

    /*
    diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
    index 8d70093847cb..da2d1ac01229 100644
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
    @@ -8,7 +8,7 @@
    * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
    * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
    * Copyright(c) 2015 - 2016 Intel Deutschland GmbH
    - * Copyright(c) 2018 - 2019 Intel Corporation
    + * Copyright(c) 2018 - 2020 Intel Corporation
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of version 2 of the GNU General Public License as
    @@ -31,7 +31,7 @@
    * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
    * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
    * Copyright(c) 2015 - 2016 Intel Deutschland GmbH
    - * Copyright(c) 2018 - 2019 Intel Corporation
    + * Copyright(c) 2018 - 2020 Intel Corporation
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    @@ -541,7 +541,7 @@ int iwl_mvm_sta_tx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
    int tid, u8 queue, bool start);

    int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm);
    -void iwl_mvm_del_aux_sta(struct iwl_mvm *mvm);
    +int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm);

    int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
    int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:55    [W:3.308 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site