From patchwork Thu Jun 4 07:09:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 11587005 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE613913 for ; Thu, 4 Jun 2020 07:10:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A01472074B for ; Thu, 4 Jun 2020 07:10:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727886AbgFDHKD (ORCPT ); Thu, 4 Jun 2020 03:10:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727861AbgFDHKC (ORCPT ); Thu, 4 Jun 2020 03:10:02 -0400 Received: from nbd.name (nbd.name [IPv6:2a01:4f8:221:3d45::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5611EC03E97D for ; Thu, 4 Jun 2020 00:10:02 -0700 (PDT) Received: from [46.59.202.224] (helo=localhost.localdomain) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1jgk0l-0001P3-5b; Thu, 04 Jun 2020 09:09:59 +0200 From: John Crispin To: Johannes Berg Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, John Crispin Subject: [PATCH 04/12] mac80211: add multiple bssid support Date: Thu, 4 Jun 2020 09:09:44 +0200 Message-Id: <20200604070952.15481-5-john@phrozen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200604070952.15481-1-john@phrozen.org> References: <20200604070952.15481-1-john@phrozen.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When bringing up multi bssid APs we need to track the parent-child relation of non-transmitting and transmitting VAPs. The patch makes sure that * a parent can not be deleted while it has children * a parent can only be opened when all children are open * a childs parent needs to exist when the child is added * a child can only be closed when its parent is already closed This patch ensures the above by using a linked list to track the relations. Signed-off-by: John Crispin --- include/net/mac80211.h | 20 ++++++++++++++ net/mac80211/cfg.c | 61 ++++++++++++++++++++++++++++++++++++++++++ net/mac80211/iface.c | 16 +++++++++++ net/mac80211/util.c | 27 +++++++++++++++++++ 4 files changed, 124 insertions(+) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b6b4de0e4b5e..bb2edace71a9 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -6529,4 +6529,24 @@ u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw, */ bool ieee80211_set_hw_80211_encap(struct ieee80211_vif *vif, bool enable); +/** + * ieee80211_get_multi_bssid_mode - get a vifs multi bssid mode. + * + * This function is used to help look up the multi bssid mode which is tracked + * inside the wdev. + * + * @vif: &struct ieee80211_vif pointer from the add_interface callback. + */ +enum nl80211_multi_bssid_mode ieee80211_get_multi_bssid_mode(struct ieee80211_vif *vif); + +/** + * ieee80211_get_multi_bssid_parent - get a vifs multi bssid parent. + * + * This function is used to help look up the multi bssid parent which is tracked + * inside the wdev. + * + * @vif: &struct ieee80211_vif pointer from the add_interface callback. + */ +struct ieee80211_vif *ieee80211_get_multi_bssid_parent(struct ieee80211_vif *vif); + #endif /* MAC80211_H */ diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index ea3791a930e8..e4f73567d873 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -111,6 +111,42 @@ static int ieee80211_set_mon_options(struct ieee80211_sub_if_data *sdata, return 0; } +static int ieee80211_set_multi_bssid_options(struct ieee80211_sub_if_data *sdata, + struct vif_params *params) +{ + struct ieee80211_local *local = sdata->local; + struct wiphy *wiphy = local->hw.wiphy; + struct net_device *parent; + + if (params->multi_bssid_mode && + !ieee80211_hw_check(&local->hw, SUPPORTS_MULTI_BSSID)) + return -ENOTSUPP; + + switch (params->multi_bssid_mode) { + case NL80211_MULTIPLE_BSSID_NON_TRANSMITTED: + parent = __dev_get_by_index(wiphy_net(wiphy), + params->multi_bssid_parent); + if (!parent || !parent->ieee80211_ptr || + parent->ieee80211_ptr->multi_bssid_mode != + NL80211_MULTIPLE_BSSID_TRANSMITTED) + return -EINVAL; + sdata->wdev.multi_bssid_parent = parent->ieee80211_ptr; + list_add(&sdata->wdev.multi_bssid_list, + &parent->ieee80211_ptr->multi_bssid_list); + break; + + case NL80211_MULTIPLE_BSSID_TRANSMITTED: + INIT_LIST_HEAD(&sdata->wdev.multi_bssid_list); + break; + + default: + break; + } + sdata->wdev.multi_bssid_mode = params->multi_bssid_mode; + + return 0; +} + static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy, const char *name, unsigned char name_assign_type, @@ -136,11 +172,36 @@ static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy, } } + if (type == NL80211_IFTYPE_AP) { + err = ieee80211_set_multi_bssid_options(sdata, params); + if (err) { + ieee80211_if_remove(sdata); + return NULL; + } + } + return wdev; } static int ieee80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev) { + struct ieee80211_sub_if_data *sdata; + + sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); + switch (sdata->wdev.multi_bssid_mode) { + case NL80211_MULTIPLE_BSSID_TRANSMITTED: + if (!list_empty(&sdata->wdev.multi_bssid_list)) + return -EBUSY; + break; + + case NL80211_MULTIPLE_BSSID_NON_TRANSMITTED: + list_del(&sdata->wdev.multi_bssid_list); + break; + + default: + break; + } + ieee80211_if_remove(IEEE80211_WDEV_TO_SUB_IF(wdev)); return 0; diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index d069825705d6..4d3d8ee99960 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -535,6 +535,15 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) } case NL80211_IFTYPE_AP: sdata->bss = &sdata->u.ap; + if (wdev->multi_bssid_mode == NL80211_MULTIPLE_BSSID_TRANSMITTED) { + struct wireless_dev *child; + + /* make sure all children are already up */ + list_for_each_entry(child, &wdev->multi_bssid_list, + multi_bssid_list) + if (!wdev_running(child)) + return -ENETDOWN; + } break; case NL80211_IFTYPE_MESH_POINT: case NL80211_IFTYPE_STATION: @@ -795,6 +804,7 @@ static int ieee80211_open(struct net_device *dev) static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_down) { + struct wireless_dev *wdev = ieee80211_vif_to_wdev(&sdata->vif); struct ieee80211_local *local = sdata->local; unsigned long flags; struct sk_buff *skb, *tmp; @@ -805,6 +815,12 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool cancel_scan; struct cfg80211_nan_func *func; + if (sdata->vif.type == NL80211_IFTYPE_AP && + wdev->multi_bssid_mode == NL80211_MULTIPLE_BSSID_NON_TRANSMITTED) + /* make sure the parent is already down */ + if (wdev_running(wdev->multi_bssid_parent)) + return; + clear_bit(SDATA_STATE_RUNNING, &sdata->state); cancel_scan = rcu_access_pointer(local->scan_sdata) == sdata; diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 20436c86b9bf..a7c4d6a44e21 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -847,6 +847,33 @@ struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif) } EXPORT_SYMBOL_GPL(ieee80211_vif_to_wdev); +enum nl80211_multi_bssid_mode ieee80211_get_multi_bssid_mode(struct ieee80211_vif *vif) +{ + struct ieee80211_sub_if_data *sdata; + + if (!vif) + return 0; + + sdata = vif_to_sdata(vif); + + return sdata->wdev.multi_bssid_mode; +} +EXPORT_SYMBOL_GPL(ieee80211_get_multi_bssid_mode); + +struct ieee80211_vif *ieee80211_get_multi_bssid_parent(struct ieee80211_vif *vif) +{ + struct ieee80211_sub_if_data *sdata; + + if (!vif) + return NULL; + + sdata = vif_to_sdata(vif); + if (sdata->wdev.multi_bssid_parent) + return wdev_to_ieee80211_vif(sdata->wdev.multi_bssid_parent); + return NULL; +} +EXPORT_SYMBOL_GPL(ieee80211_get_multi_bssid_parent); + /* * Nothing should have been stuffed into the workqueue during * the suspend->resume cycle. Since we can't check each caller