| Message ID | 20240124132814.802018-2-quic_adisi@quicinc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | wifi: cfg80211/mac80211: add support to flush stations based on link ID | expand |
On 1/24/2024 5:28 AM, Aditya Kumar Singh wrote: > Currently whenever NL80211_CMD_DEL_STATION command is called without any > MAC address, all stations present on that interface are flushed. > However with MLO there is a need to flush the stations from a particular > link in the interface, and not from all the links associated with the MLD > interface. > > For example - 2 GHz and 5 GHz are part of an AP MLD. When 2 GHz BSS is > brought up, it sends flush command on the interface (MLD). Then eventually "it sends": can you please clarify what "it" is > 5 GHZ links comes up and that also sends the command on the same interface. "that also sends": likewise what is "that" > Now by the time 5 GHz link comes up, if any station gets connected to 2 GHz > link, it would be flushed while 5 GHz link is started which is wrong. > > Hence, add an option to pass link ID as well in the command so that if link > ID is passed, station using that passed link ID alone would be deleted > and others will not be removed. > > A subsequent patch would add logic to delete only the station using the > passed link ID. > > Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com> Actual code change LGTM
On 1/25/24 05:10, Jeff Johnson wrote: > On 1/24/2024 5:28 AM, Aditya Kumar Singh wrote: >> Currently whenever NL80211_CMD_DEL_STATION command is called without any >> MAC address, all stations present on that interface are flushed. >> However with MLO there is a need to flush the stations from a particular >> link in the interface, and not from all the links associated with the MLD >> interface. >> >> For example - 2 GHz and 5 GHz are part of an AP MLD. When 2 GHz BSS is >> brought up, it sends flush command on the interface (MLD). Then eventually > > "it sends": can you please clarify what "it" is > Hostapd. During any BSS bring up, it sends NL80211_CMD_DEL_STATION without any mac address (since at that point expectation is to delete any stale station entries on that interface). But now with MLO, need is there to handle this on link basis. >> 5 GHZ links comes up and that also sends the command on the same interface. > > "that also sends": likewise what is "that" > Same hostapd. >> Now by the time 5 GHz link comes up, if any station gets connected to 2 GHz >> link, it would be flushed while 5 GHz link is started which is wrong. >> >> Hence, add an option to pass link ID as well in the command so that if link >> ID is passed, station using that passed link ID alone would be deleted >> and others will not be removed. >> >> A subsequent patch would add logic to delete only the station using the >> passed link ID. >> >> Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com> > Actual code change LGTM Even though the current example is hostapd but the use case is at any time and by any user space application. If there is need to flush all stations (from a link), just sending NL80211_CMD_DEL_STATION would not work in case of MLO.
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index cf79656ce09c..2e194638717d 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1766,11 +1766,14 @@ struct station_parameters { * @subtype: Management frame subtype to use for indicating removal * (10 = Disassociation, 12 = Deauthentication) * @reason_code: Reason code for the Disassociation/Deauthentication frame + * @link_id: Link ID on which station should be connected at least in order + * to delete its entry. Valid only during MLO. */ struct station_del_parameters { const u8 *mac; u8 subtype; u16 reason_code; + int link_id; }; /** diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 1ccdcae24372..4197d7097591 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -438,7 +438,8 @@ * %NL80211_ATTR_REASON_CODE can optionally be used to specify which type * of disconnection indication should be sent to the station * (Deauthentication or Disassociation frame and reason code for that - * frame). + * frame). %NL80211_ATTR_MLO_LINK_ID can be used optionally to remove + * stations connected and using at least that link. * * @NL80211_CMD_GET_MPATH: Get mesh path attributes for mesh path to * destination %NL80211_ATTR_MAC on the interface identified by diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 60877b532993..a99537828978 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -7627,14 +7627,16 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; + struct wireless_dev *wdev = dev->ieee80211_ptr; struct station_del_parameters params; + int link_id = nl80211_link_id_or_invalid(info->attrs); memset(¶ms, 0, sizeof(params)); if (info->attrs[NL80211_ATTR_MAC]) params.mac = nla_data(info->attrs[NL80211_ATTR_MAC]); - switch (dev->ieee80211_ptr->iftype) { + switch (wdev->iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_MESH_POINT: @@ -7675,6 +7677,17 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info) params.reason_code = WLAN_REASON_PREV_AUTH_NOT_VALID; } + /* Link ID not expected in case of non-ML operation */ + if (!wdev->valid_links && link_id != -1) + return -EINVAL; + + /* If given, a valid link ID should be passed during MLO */ + if (wdev->valid_links && link_id >= 0 && + !(wdev->valid_links & BIT(link_id))) + return -EINVAL; + + params.link_id = link_id; + return rdev_del_station(rdev, dev, ¶ms); } @@ -16827,6 +16840,9 @@ static const struct genl_small_ops nl80211_small_ops[] = { .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = nl80211_del_station, .flags = GENL_UNS_ADMIN_PERM, + /* cannot use NL80211_FLAG_MLO_VALID_LINK_ID, depends on + * MAC address + */ .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP), }, { diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 1f374c8a17a5..838107186b91 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -859,6 +859,7 @@ DECLARE_EVENT_CLASS(station_del, MAC_ENTRY(sta_mac) __field(u8, subtype) __field(u16, reason_code) + __field(int, link_id) ), TP_fast_assign( WIPHY_ASSIGN; @@ -866,11 +867,13 @@ DECLARE_EVENT_CLASS(station_del, MAC_ASSIGN(sta_mac, params->mac); __entry->subtype = params->subtype; __entry->reason_code = params->reason_code; + __entry->link_id = params->link_id; ), TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: %pM" - ", subtype: %u, reason_code: %u", + ", subtype: %u, reason_code: %u, link_id: %d", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->sta_mac, - __entry->subtype, __entry->reason_code) + __entry->subtype, __entry->reason_code, + __entry->link_id) ); DEFINE_EVENT(station_del, rdev_del_station,
Currently whenever NL80211_CMD_DEL_STATION command is called without any MAC address, all stations present on that interface are flushed. However with MLO there is a need to flush the stations from a particular link in the interface, and not from all the links associated with the MLD interface. For example - 2 GHz and 5 GHz are part of an AP MLD. When 2 GHz BSS is brought up, it sends flush command on the interface (MLD). Then eventually 5 GHZ links comes up and that also sends the command on the same interface. Now by the time 5 GHz link comes up, if any station gets connected to 2 GHz link, it would be flushed while 5 GHz link is started which is wrong. Hence, add an option to pass link ID as well in the command so that if link ID is passed, station using that passed link ID alone would be deleted and others will not be removed. A subsequent patch would add logic to delete only the station using the passed link ID. Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com> --- include/net/cfg80211.h | 3 +++ include/uapi/linux/nl80211.h | 3 ++- net/wireless/nl80211.c | 18 +++++++++++++++++- net/wireless/trace.h | 7 +++++-- 4 files changed, 27 insertions(+), 4 deletions(-)