Commit 687da132 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

mac80211: implement SMPS for AP 



When the driver requests to move to STATIC or DYNAMIC SMPS,
we send an action frame to each associated station and
reconfigure the channel context / driver.
Of course, non-MIMO stations are ignored.

The beacon isn't updated. The association response will
include the original capabilities. Stations that associate
while in non-OFF SMPS mode will get an action frame right
after association to inform them about our current state.
Note that we wait until the end of the EAPOL. Sending an
action frame before the EAPOL is finished can be an issue
for a few clients. Clients aren't likely to send EAPOL
frames in MIMO anyway.

When the SMPS configuration gets more permissive (e.g.
STATIC -> OFF), we don't wake up stations that are asleep
We remember that they don't know about the change and send
the action frame when they wake up.

When the SMPS configuration gets more restrictive (e.g.
OFF -> STATIC), we set the TIM bit for every sleeping STA.
uAPSD stations might send MIMO until they poll the action
frame, but this is for a short period of time.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
[fix vht streams loop, initialisation]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7ec7c4a9

net/mac80211/cfg.c

+105 −3
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
	/* abort any running channel switch */

	sdata->vif.csa_active = false;

	cancel_work_sync(&sdata->csa_finalize_work);

	cancel_work_sync(&sdata->u.ap.request_smps_work);



	/* turn off carrier for this interface and dependent VLANs */

	list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
@@ -1553,6 +1554,20 @@ static int ieee80211_change_station(struct wiphy *wiphy, 


	mutex_unlock(&local->sta_mtx);



	if ((sdata->vif.type == NL80211_IFTYPE_AP ||

	     sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&

	    sta->known_smps_mode != sta->sdata->bss->req_smps &&

	    test_sta_flag(sta, WLAN_STA_AUTHORIZED) &&

	    sta_info_tx_streams(sta) != 1) {

		ht_dbg(sta->sdata,

		       "%pM just authorized and MIMO capable - update SMPS\n",

		       sta->sta.addr);

		ieee80211_send_smps_action(sta->sdata,

			sta->sdata->bss->req_smps,

			sta->sta.addr,

			sta->sdata->vif.bss_conf.bssid);

	}



	if (sdata->vif.type == NL80211_IFTYPE_STATION &&

	    params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {

		ieee80211_recalc_ps(local, -1);
@@ -2337,7 +2352,91 @@ static int ieee80211_testmode_dump(struct wiphy *wiphy, 
}

#endif



int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata,

int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata,

				enum ieee80211_smps_mode smps_mode)

{

	struct sta_info *sta;

	enum ieee80211_smps_mode old_req;

	int i;



	if (WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_AP))

		return -EINVAL;



	if (sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT)

		return 0;



	old_req = sdata->u.ap.req_smps;

	sdata->u.ap.req_smps = smps_mode;



	/* AUTOMATIC doesn't mean much for AP - don't allow it */

	if (old_req == smps_mode ||

	    smps_mode == IEEE80211_SMPS_AUTOMATIC)

		return 0;



	 /* If no associated stations, there's no need to do anything */

	if (!atomic_read(&sdata->u.ap.num_mcast_sta)) {

		sdata->smps_mode = smps_mode;

		ieee80211_queue_work(&sdata->local->hw, &sdata->recalc_smps);

		return 0;

	}



	ht_dbg(sdata,

	       "SMSP %d requested in AP mode, sending Action frame to %d stations\n",

	       smps_mode, atomic_read(&sdata->u.ap.num_mcast_sta));



	mutex_lock(&sdata->local->sta_mtx);

	for (i = 0; i < STA_HASH_SIZE; i++) {

		for (sta = rcu_dereference_protected(sdata->local->sta_hash[i],

				lockdep_is_held(&sdata->local->sta_mtx));

		     sta;

		     sta = rcu_dereference_protected(sta->hnext,

				lockdep_is_held(&sdata->local->sta_mtx))) {

			/*

			 * Only stations associated to our AP and

			 * associated VLANs

			 */

			if (sta->sdata->bss != &sdata->u.ap)

				continue;



			/* This station doesn't support MIMO - skip it */

			if (sta_info_tx_streams(sta) == 1)

				continue;



			/*

			 * Don't wake up a STA just to send the action frame

			 * unless we are getting more restrictive.

			 */

			if (test_sta_flag(sta, WLAN_STA_PS_STA) &&

			    !ieee80211_smps_is_restrictive(sta->known_smps_mode,

							   smps_mode)) {

				ht_dbg(sdata,

				       "Won't send SMPS to sleeping STA %pM\n",

				       sta->sta.addr);

				continue;

			}



			/*

			 * If the STA is not authorized, wait until it gets

			 * authorized and the action frame will be sent then.

			 */

			if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED))

				continue;



			ht_dbg(sdata, "Sending SMPS to %pM\n", sta->sta.addr);

			ieee80211_send_smps_action(sdata, smps_mode,

						   sta->sta.addr,

						   sdata->vif.bss_conf.bssid);

		}

	}

	mutex_unlock(&sdata->local->sta_mtx);



	sdata->smps_mode = smps_mode;

	ieee80211_queue_work(&sdata->local->hw, &sdata->recalc_smps);



	return 0;

}



int __ieee80211_request_smps_mgd(struct ieee80211_sub_if_data *sdata,

				 enum ieee80211_smps_mode smps_mode)

{

	const u8 *ap;
@@ -2346,6 +2445,9 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata, 


	lockdep_assert_held(&sdata->wdev.mtx);



	if (WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION))

		return -EINVAL;



	old_req = sdata->u.mgd.req_smps;

	sdata->u.mgd.req_smps = smps_mode;
@@ -2402,7 +2504,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, 


	/* no change, but if automatic follow powersave */

	sdata_lock(sdata);

	__ieee80211_request_smps(sdata, sdata->u.mgd.req_smps);

	__ieee80211_request_smps_mgd(sdata, sdata->u.mgd.req_smps);

	sdata_unlock(sdata);



	if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)

net/mac80211/debugfs_netdev.c

+16 −9
Original line number Diff line number Diff line
@@ -224,12 +224,15 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata, 
	     smps_mode == IEEE80211_SMPS_AUTOMATIC))

		return -EINVAL;



	/* supported only on managed interfaces for now */

	if (sdata->vif.type != NL80211_IFTYPE_STATION)

	if (sdata->vif.type != NL80211_IFTYPE_STATION &&

	    sdata->vif.type != NL80211_IFTYPE_AP)

		return -EOPNOTSUPP;



	sdata_lock(sdata);

	err = __ieee80211_request_smps(sdata, smps_mode);

	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		err = __ieee80211_request_smps_mgd(sdata, smps_mode);

	else

		err = __ieee80211_request_smps_ap(sdata, smps_mode);

	sdata_unlock(sdata);



	return err;
@@ -245,12 +248,15 @@ static const char *smps_modes[IEEE80211_SMPS_NUM_MODES] = { 
static ssize_t ieee80211_if_fmt_smps(const struct ieee80211_sub_if_data *sdata,

				     char *buf, int buflen)

{

	if (sdata->vif.type != NL80211_IFTYPE_STATION)

		return -EOPNOTSUPP;



	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return snprintf(buf, buflen, "request: %s\nused: %s\n",

				smps_modes[sdata->u.mgd.req_smps],

				smps_modes[sdata->smps_mode]);

	if (sdata->vif.type == NL80211_IFTYPE_AP)

		return snprintf(buf, buflen, "request: %s\nused: %s\n",

				smps_modes[sdata->u.ap.req_smps],

				smps_modes[sdata->smps_mode]);

	return -EINVAL;

}



static ssize_t ieee80211_if_parse_smps(struct ieee80211_sub_if_data *sdata,
@@ -563,6 +569,7 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata) 
static void add_ap_files(struct ieee80211_sub_if_data *sdata)

{

	DEBUGFS_ADD(num_mcast_sta);

	DEBUGFS_ADD_MODE(smps, 0600);

	DEBUGFS_ADD(num_sta_ps);

	DEBUGFS_ADD(dtim_count);

	DEBUGFS_ADD(num_buffered_multicast);

net/mac80211/ht.c

+31 −10
Original line number Diff line number Diff line
@@ -448,14 +448,25 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata, 
	return 0;

}



void ieee80211_request_smps_work(struct work_struct *work)

void ieee80211_request_smps_mgd_work(struct work_struct *work)

{

	struct ieee80211_sub_if_data *sdata =

		container_of(work, struct ieee80211_sub_if_data,

			     u.mgd.request_smps_work);



	sdata_lock(sdata);

	__ieee80211_request_smps(sdata, sdata->u.mgd.driver_smps_mode);

	__ieee80211_request_smps_mgd(sdata, sdata->u.mgd.driver_smps_mode);

	sdata_unlock(sdata);

}



void ieee80211_request_smps_ap_work(struct work_struct *work)

{

	struct ieee80211_sub_if_data *sdata =

		container_of(work, struct ieee80211_sub_if_data,

			     u.ap.request_smps_work);



	sdata_lock(sdata);

	__ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);

	sdata_unlock(sdata);

}
@@ -464,19 +475,29 @@ void ieee80211_request_smps(struct ieee80211_vif *vif, 
{

	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);



	if (WARN_ON(vif->type != NL80211_IFTYPE_STATION))

	if (WARN_ON_ONCE(vif->type != NL80211_IFTYPE_STATION &&

			 vif->type != NL80211_IFTYPE_AP))

		return;



	if (WARN_ON(smps_mode == IEEE80211_SMPS_OFF))

		smps_mode = IEEE80211_SMPS_AUTOMATIC;



	if (vif->type == NL80211_IFTYPE_STATION) {

		if (sdata->u.mgd.driver_smps_mode == smps_mode)

			return;



		sdata->u.mgd.driver_smps_mode = smps_mode;



		ieee80211_queue_work(&sdata->local->hw,

				     &sdata->u.mgd.request_smps_work);

	} else {

		/* AUTOMATIC is meaningless in AP mode */

		if (WARN_ON_ONCE(smps_mode == IEEE80211_SMPS_AUTOMATIC))

			return;

		if (sdata->u.ap.driver_smps_mode == smps_mode)

			return;

		sdata->u.ap.driver_smps_mode = smps_mode;

		ieee80211_queue_work(&sdata->local->hw,

				     &sdata->u.ap.request_smps_work);

	}

}

/* this might change ... don't want non-open drivers using it */

EXPORT_SYMBOL_GPL(ieee80211_request_smps);

net/mac80211/ieee80211_i.h

+12 −3
Original line number Diff line number Diff line
@@ -262,6 +262,10 @@ struct ieee80211_if_ap { 


	struct ps_data ps;

	atomic_t num_mcast_sta; /* number of stations receiving multicast */

	enum ieee80211_smps_mode req_smps, /* requested smps mode */

			 driver_smps_mode; /* smps mode request */



	struct work_struct request_smps_work;

};



struct ieee80211_if_wds {
@@ -1435,7 +1439,10 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, 
int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,

			       enum ieee80211_smps_mode smps, const u8 *da,

			       const u8 *bssid);

void ieee80211_request_smps_work(struct work_struct *work);

void ieee80211_request_smps_ap_work(struct work_struct *work);

void ieee80211_request_smps_mgd_work(struct work_struct *work);

bool ieee80211_smps_is_restrictive(enum ieee80211_smps_mode smps_mode_old,

				   enum ieee80211_smps_mode smps_mode_new);



void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,

				     u16 initiator, u16 reason, bool stop);
@@ -1653,7 +1660,9 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, 
u32 ieee80211_sta_get_rates(struct ieee80211_sub_if_data *sdata,

			    struct ieee802_11_elems *elems,

			    enum ieee80211_band band, u32 *basic_rates);

int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata,

int __ieee80211_request_smps_mgd(struct ieee80211_sub_if_data *sdata,

				 enum ieee80211_smps_mode smps_mode);

int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata,

				enum ieee80211_smps_mode smps_mode);

void ieee80211_recalc_smps(struct ieee80211_sub_if_data *sdata);

net/mac80211/iface.c

+3 −0
Original line number Diff line number Diff line
@@ -1293,7 +1293,10 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 
	case NL80211_IFTYPE_AP:

		skb_queue_head_init(&sdata->u.ap.ps.bc_buf);

		INIT_LIST_HEAD(&sdata->u.ap.vlans);

		INIT_WORK(&sdata->u.ap.request_smps_work,

			  ieee80211_request_smps_ap_work);

		sdata->vif.bss_conf.bssid = sdata->vif.addr;

		sdata->u.ap.req_smps = IEEE80211_SMPS_OFF;

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

		type = NL80211_IFTYPE_STATION;

CRA Git | Maintained and supported by SUSTech CRA and CCSE