Hi,
On Thu, 2022-05-26 at 06:56 +0530, Veerendranath Jakkam wrote:
> The MLO links used for connection with an MLD AP are decided by the
> driver in case of SME offloaded to driver.
>
> Add support for the drivers to indicate the information of links used
> for MLO connection in connect and roam callbacks, update the connected
> links information in wdev from connect/roam result sent by driver.
> Also, send the connected links information to userspace.
>
> Add a netlink flag attribute to indicate that userspace supports
> handling of MLO connection. Drivers must not do MLO connection when this
> flag is not set. This is to maintain backwards compatibility with older
> supplicant versions which doesn't have support for MLO connection.
Looks good to me!
Couple of questions/nits below:
> + * @links.bssid: For MLO connection, MAC address of the AP link. For non-MLO
> + * connection, links[0].bssid points to the BSSID of the AP (may be %NULL).
> + * @links.bss: For MLO connection, entry of bss to which STA link is connected
> + * to, can be obtained through cfg80211_get_bss() but may be %NULL for some
> + * valid links as scan results of all AP links may not be received.
Do we want to encourage that? In that case, we cannot show all the
information about the BSS to userspace, nor hold on to the entry to
later show that we're connected, etc.
Even now I'm not sure I like this code that lets the driver get away
without a BSS entry.
Maybe it'd be better to ask the driver to make up an entry on the fly
and reference it, at least with the right channel, so it can be updated
later?
>
> + NL80211_ATTR_MLO_SUPPORT,
> /* add attributes here, update the policy in nl80211.c */
>
please add a blank line there after the new attribute
> + unsigned int link;
> + const u8 *connected_addr;
> + bool bss_found = false;
> + bool self_link_addr_miss = false;
>
[...]
>
> + if (cr->valid_links) {
> + for_each_valid_link(cr, link) {
> + if (!cr->links[link].addr) {
> + self_link_addr_miss = true;
You can declare self_link_addr_miss inside the "if (cr->valid_links) {"
scope, I think?
> + for_each_valid_link(cr, link)
> + cfg80211_put_bss(wdev->wiphy, cr->links[link].bss);
It might be worth extracting this into a small helper function, you do
it quite a number of times.
> + if ((!cr->valid_links && link == 1) ||
> + (cr->valid_links && link == ARRAY_SIZE(wdev->links)))
> + WARN_ON_ONCE(!wiphy_to_rdev(wdev->wiphy)->ops->connect);
You can put all the conditions inside the WARN_ON_ONCE(), no?
But is this even right, seems like even mac80211 with auth/assoc might
eventually get to some of this code?
> + memset(wdev->links, 0, sizeof(wdev->links));
> + wdev->valid_links = cr->valid_links;
> + for_each_valid_link(cr, link) {
> + if (!cr->links[link].bss)
> + continue;
> +
> + wdev->links[link].client.current_bss = bss_from_pub(
> + cr->links[link].bss);
maybe line-break after =, instead of like this
> + if (cr->valid_links)
> + for_each_valid_link(cr, link)
> + ether_addr_copy(wdev->links[link].addr,
> + cr->links[link].addr);
>
I think I might prefer braces for the "if", so it's more obvious. Dunno.
Are you sure ether_addr_copy is fine, there wasn't really any alignment
guarantee on cr->links[link].addr.
> @@ -910,6 +1025,11 @@ void __cfg80211_roamed(struct wireless_dev *wdev,
> #ifdef CONFIG_CFG80211_WEXT
> union iwreq_data wrqu;
> #endif
> + unsigned int link;
> + const u8 *connected_addr;
> + bool bss_found = false;
> + bool self_link_addr_miss = false;
> +
> ASSERT_WDEV_LOCK(wdev);
>
> if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION &&
> @@ -919,14 +1039,50 @@ void __cfg80211_roamed(struct wireless_dev *wdev,
> if (WARN_ON(!wdev->connected))
> goto out;
>
> + if (info->valid_links) {
> + for_each_valid_link(info, link) {
> + if (!info->links[link].addr) {
> + self_link_addr_miss = true;
same here as above
maybe it's worth pulling out the validation into a separate function?
> @@ -949,18 +1105,19 @@ void __cfg80211_roamed(struct wireless_dev *wdev,
>
> memset(&wrqu, 0, sizeof(wrqu));
> wrqu.ap_addr.sa_family = ARPHRD_ETHER;
> - memcpy(wrqu.ap_addr.sa_data, info->bss->bssid, ETH_ALEN);
> - memcpy(wdev->wext.prev_bssid, info->bss->bssid, ETH_ALEN);
> + memcpy(wrqu.ap_addr.sa_data, connected_addr, ETH_ALEN);
> + memcpy(wdev->wext.prev_bssid, connected_addr, ETH_ALEN);
> wdev->wext.prev_bssid_valid = true;
> wireless_send_event(wdev->netdev, SIOCGIWAP, &wrqu, NULL);
> #endif
I wonder if we should just completely skip WEXT stuff for MLD, it's
probably not going to result in anything useful? Hmm.
> + for_each_valid_link(info, link)
> + cfg80211_put_bss(wdev->wiphy, info->links[link].bss);
again this :)
> @@ -969,23 +1126,42 @@ void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> struct cfg80211_event *ev;
> unsigned long flags;
> u8 *next;
> + unsigned int link;
> + size_t link_info_size = 0;
> + bool bss_found = false;
> +
> + for_each_valid_link(info, link) {
> + link_info_size += info->links[link].addr ? ETH_ALEN : 0;
> + link_info_size += info->links[link].bssid ? ETH_ALEN : 0;
>
> - if (!info->bss) {
> - info->bss = cfg80211_get_bss(wdev->wiphy, info->channel,
> - info->bssid, wdev->u.client.ssid,
> - wdev->u.client.ssid_len,
> - wdev->conn_bss_type,
> - IEEE80211_PRIVACY_ANY);
> + if (info->links[link].bss) {
> + bss_found = true;
> + continue;
> + }
> +
> + info->links[link].bss = cfg80211_get_bss(
> + wdev->wiphy,
> + info->links[link].channel,
> + info->links[link].bssid,
> + wdev->u.client.ssid,
> + wdev->u.client.ssid_len,
> + wdev->conn_bss_type,
> + IEEE80211_PRIVACY_ANY);
> +
> + if (info->links[link].bss)
> + bss_found = true;
> }
>
> - if (WARN_ON(!info->bss))
> + if (WARN_ON(!bss_found))
> return;
This goes with my question earlier - here you're basically assuming
finding a single BSS is fine. Do we really think so? It used to be we
wanted all of them, and I kind of tend to think drivers should just make
sure they have all of them - once we have the entry it can be updated,
but if we don't have one, we'll never again get the information on the
BSS, for purposes such as "iw link" output.
I tend to think we should always require all BSS entries to exist, even
if the driver initially has to make up a fake entry with pretty much no
information.
Or maybe we have enough information here already (BSSID/frequency) to
make up a fake entry in cfg80211?
> + if (info->ap_mld_addr) {
> + ev->rm.ap_mld_addr = next;
> + memcpy((void *)ev->rm.ap_mld_addr, info->ap_mld_addr,
> + ETH_ALEN);
Why the cast?
johannes
