Commit 8cef5344 authored by Kees Cook's avatar Kees Cook Committed by Luca Coelho
Browse files

iwlwifi: mvm: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

The RCU lifetime on baid_data is unclear, so this adds a direct copy of the
rcu_ptr passed to the original callback. It may be possible to improve this
to just use baid_data->mvm->baid_map[baid_data->baid] instead.

Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Cc: Luca Coelho <luciano.coelho@intel.com>
Cc: Intel Linux Wireless <linuxwifi@intel.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Sara Sharon <sara.sharon@intel.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 309c4848

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+2 −1
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ struct iwl_mvm_baid_data { 
	u16 entries_per_queue;

	unsigned long last_rx;

	struct timer_list session_timer;

	struct iwl_mvm_baid_data __rcu **rcu_ptr;

	struct iwl_mvm *mvm;

	struct iwl_mvm_reorder_buffer reorder_buf[IWL_MAX_RX_HW_QUEUES];

	struct iwl_mvm_reorder_buf_entry entries[];
@@ -1853,7 +1854,7 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work); 
void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,

				     struct iwl_mvm_internal_rxq_notif *notif,

				     u32 size);

void iwl_mvm_reorder_timer_expired(unsigned long data);

void iwl_mvm_reorder_timer_expired(struct timer_list *t);

struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm);

bool iwl_mvm_is_vif_assoc(struct iwl_mvm *mvm);

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

+2 −2
Original line number Diff line number Diff line
@@ -460,9 +460,9 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm, 
	}

}



void iwl_mvm_reorder_timer_expired(unsigned long data)

void iwl_mvm_reorder_timer_expired(struct timer_list *t)

{

	struct iwl_mvm_reorder_buffer *buf = (void *)data;

	struct iwl_mvm_reorder_buffer *buf = from_timer(buf, t, reorder_timer);

	struct iwl_mvm_baid_data *baid_data =

		iwl_mvm_baid_data_from_reorder_buf(buf);

	struct iwl_mvm_reorder_buf_entry *entries =

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+9 −9
Original line number Diff line number Diff line
@@ -252,9 +252,11 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	return ret;

}



static void iwl_mvm_rx_agg_session_expired(unsigned long data)

static void iwl_mvm_rx_agg_session_expired(struct timer_list *t)

{

	struct iwl_mvm_baid_data __rcu **rcu_ptr = (void *)data;

	struct iwl_mvm_baid_data *data =

		from_timer(data, t, session_timer);

	struct iwl_mvm_baid_data __rcu **rcu_ptr = data->rcu_ptr;

	struct iwl_mvm_baid_data *ba_data;

	struct ieee80211_sta *sta;

	struct iwl_mvm_sta *mvm_sta;
@@ -2160,10 +2162,8 @@ static void iwl_mvm_init_reorder_buffer(struct iwl_mvm *mvm, 
		reorder_buf->head_sn = ssn;

		reorder_buf->buf_size = buf_size;

		/* rx reorder timer */

		reorder_buf->reorder_timer.function =

			iwl_mvm_reorder_timer_expired;

		reorder_buf->reorder_timer.data = (unsigned long)reorder_buf;

		init_timer(&reorder_buf->reorder_timer);

		timer_setup(&reorder_buf->reorder_timer,

			    iwl_mvm_reorder_timer_expired, 0);

		spin_lock_init(&reorder_buf->lock);

		reorder_buf->mvm = mvm;

		reorder_buf->queue = i;
@@ -2286,9 +2286,9 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
		baid_data->baid = baid;

		baid_data->timeout = timeout;

		baid_data->last_rx = jiffies;

		setup_timer(&baid_data->session_timer,

			    iwl_mvm_rx_agg_session_expired,

			    (unsigned long)&mvm->baid_map[baid]);

		baid_data->rcu_ptr = &mvm->baid_map[baid];

		timer_setup(&baid_data->session_timer,

			    iwl_mvm_rx_agg_session_expired, 0);

		baid_data->mvm = mvm;

		baid_data->tid = tid;

		baid_data->sta_id = mvm_sta->sta_id;