Commit 1444f589 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: use wiphy work for SMPS 



SMPS requests are per link, and currently there's a potential
deadlock with canceling. Use the new wiphy work to handle SMPS
instead, so that the cancel cannot deadlock.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a3df43b1

net/mac80211/ht.c

+3 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007-2010, Intel Corporation

 * Copyright 2017	Intel Deutschland GmbH

 * Copyright(c) 2020-2022 Intel Corporation

 * Copyright(c) 2020-2023 Intel Corporation

 */



#include <linux/ieee80211.h>
@@ -602,7 +602,8 @@ void ieee80211_request_smps(struct ieee80211_vif *vif, unsigned int link_id, 
		goto out;



	link->u.mgd.driver_smps_mode = smps_mode;

	ieee80211_queue_work(&sdata->local->hw, &link->u.mgd.request_smps_work);

	wiphy_work_queue(sdata->local->hw.wiphy,

			 &link->u.mgd.request_smps_work);

out:

	rcu_read_unlock();

}

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ struct ieee80211_link_data_managed { 
	struct timer_list chswitch_timer;

	struct work_struct chswitch_work;



	struct work_struct request_smps_work;

	struct wiphy_work request_smps_work;

	bool beacon_crc_valid;

	u32 beacon_crc;

	struct ewma_beacon_signal ave_beacon_signal;

net/mac80211/mlme.c

+6 −4
Original line number Diff line number Diff line
@@ -6538,7 +6538,8 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) 
	sdata_unlock(sdata);

}



static void ieee80211_request_smps_mgd_work(struct work_struct *work)

static void ieee80211_request_smps_mgd_work(struct wiphy *wiphy,

					    struct wiphy_work *work)

{

	struct ieee80211_link_data *link =

		container_of(work, struct ieee80211_link_data,
@@ -6588,7 +6589,7 @@ void ieee80211_mgd_setup_link(struct ieee80211_link_data *link) 
	link->u.mgd.conn_flags = 0;

	link->conf->bssid = link->u.mgd.bssid;



	INIT_WORK(&link->u.mgd.request_smps_work,

	wiphy_work_init(&link->u.mgd.request_smps_work,

			ieee80211_request_smps_mgd_work);

	if (local->hw.wiphy->features & NL80211_FEATURE_DYNAMIC_SMPS)

		link->u.mgd.req_smps = IEEE80211_SMPS_AUTOMATIC;
@@ -7552,7 +7553,8 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, 


void ieee80211_mgd_stop_link(struct ieee80211_link_data *link)

{

	cancel_work_sync(&link->u.mgd.request_smps_work);

	wiphy_work_cancel(link->sdata->local->hw.wiphy,

			  &link->u.mgd.request_smps_work);

	cancel_work_sync(&link->u.mgd.chswitch_work);

}

net/mac80211/tdls.c

+2 −2
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, 
	}



	if (ret == 0)

		ieee80211_queue_work(&sdata->local->hw,

		wiphy_work_queue(sdata->local->hw.wiphy,

				 &sdata->deflink.u.mgd.request_smps_work);



	mutex_unlock(&local->mtx);