mac802154: iface: better concurrent iface handling
Subsystems (2)
Alexander Aring
maintainerv2 cover mac802154: iface: better concurrent iface handling
This patch series contains changes for a better multiple iface handling. We have only one phy with several mac parameters like csma, aret, etc. Currently it could be that one interface can overwrite these parameters while ifup when another interface is currently running. To avoid that we compare each parameter and check if differs, if not we allow to ifup the interface.
changes since v2:
- fix mixed comments and variable declaration.
Alexander Aring (2):
mac802154: iface: check concurrent ifaces
ieee802154: iface: move multiple node type check
net/mac802154/iface.c | 100 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 86 insertions(+), 14 deletions(-)
Signature · 1 line
2.2.0
Alexander Aring
maintainerPATCH v2 1/2 mac802154: iface: check concurrent ifaces
This patch adds a check for concurrent interfaces while calling interface up. This avoids to have different mac parameters on one phy. Otherwise it could be that a interface can overwrite current phy mac settings which is set by an another interface.
--- net/mac802154/iface.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)
net/mac802154/iface.c +77 -0
@@ -175,6 +175,79 @@ err:return res; } +static int +ieee802154_check_mac_settings (struct ieee802154_local *local, +struct wpan_dev *wpan_dev, +struct wpan_dev *nwpan_dev) +{ +ASSERT_RTNL (); + +if (local->hw.flags &IEEE802154_HW_PROMISCUOUS ) { +if (wpan_dev->promiscuous_mode != nwpan_dev->promiscuous_mode) +return -EBUSY ; + } + +if (local->hw.flags &IEEE802154_HW_AFILT ) { +if (wpan_dev->pan_id != nwpan_dev->pan_id) +return -EBUSY ; + +if (wpan_dev->short_addr != nwpan_dev->short_addr) +return -EBUSY ; + +if (wpan_dev->extended_addr != nwpan_dev->extended_addr) +return -EBUSY ; + } + +if (local->hw.flags &IEEE802154_HW_CSMA_PARAMS ) { +if (wpan_dev->min_be != nwpan_dev->min_be) +return -EBUSY ; + +if (wpan_dev->max_be != nwpan_dev->max_be) +return -EBUSY ; + +if (wpan_dev->csma_retries != nwpan_dev->csma_retries) +return -EBUSY ; + } + +if (local->hw.flags &IEEE802154_HW_FRAME_RETRIES ) { +if (wpan_dev->frame_retries != nwpan_dev->frame_retries) +return -EBUSY ; + } + +if (local->hw.flags &IEEE802154_HW_LBT ) { +if (wpan_dev->lbt != nwpan_dev->lbt) +return -EBUSY ; + } + +return 0 ; +} + +static int +ieee802154_check_concurrent_iface (struct ieee802154_sub_if_data *sdata, +enum nl802154_iftype iftype) +{ +struct ieee802154_local *local = sdata->local; +struct wpan_dev *wpan_dev = &sdata->wpan_dev; +struct ieee802154_sub_if_data *nsdata; + +/* we hold the RTNL here so can safely walk the list */ +list_for_each_entry (nsdata, &local->interfaces, list) { +if (nsdata != sdata &&ieee802154_sdata_running (nsdata)) { +int ret; + +/* check all phy mac sublayer settings are the same. +* We have only one phy, different values makes trouble. +*/ + ret =ieee802154_check_mac_settings (local, wpan_dev, + &nsdata->wpan_dev); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +static int mac802154_wpan_open (struct net_device *dev) {int rc;
@@ -183,6 +256,10 @@ static int mac802154_wpan_open(struct net_device *dev)struct wpan_dev *wpan_dev = &sdata->wpan_dev;struct wpan_phy *phy = sdata->local->phy; + rc =ieee802154_check_concurrent_iface (sdata, sdata->vif.type); +if (rc <0 ) +return rc; + rc =mac802154_slave_open (dev);if (rc <0 )return rc;
Signature · 1 line
2.2.0
Alexander Aring
maintainerPATCH v2 2/2 ieee802154: iface: move multiple node type check
In reply to Alexander AringThis patch moves the handling for checking on multiple node type interface to the corresponding concurrent iface check function.
--- net/mac802154/iface.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
net/mac802154/iface.c +9 -14
@@ -137,25 +137,11 @@ static int mac802154_wpan_mac_addr(struct net_device *dev, void *p)static int mac802154_slave_open (struct net_device *dev) {struct ieee802154_sub_if_data *sdata =IEEE802154_DEV_TO_SUB_IF (dev); -struct ieee802154_sub_if_data *subif;struct ieee802154_local *local = sdata->local;int res =0 ;ASSERT_RTNL (); -if (sdata->vif.type ==NL802154_IFTYPE_NODE ) { -mutex_lock (&sdata->local->iflist_mtx); -list_for_each_entry (subif, &sdata->local->interfaces, list) { -if (subif != sdata && - subif->vif.type == sdata->vif.type && -ieee802154_sdata_running (subif)) { -mutex_unlock (&sdata->local->iflist_mtx); -return -EBUSY ; - } - } -mutex_unlock (&sdata->local->iflist_mtx); - } -set_bit (SDATA_STATE_RUNNING , &sdata->state);if (!local->open_count) {
@@ -235,6 +221,15 @@ ieee802154_check_concurrent_iface(struct ieee802154_sub_if_data *sdata,if (nsdata != sdata &&ieee802154_sdata_running (nsdata)) {int ret; +/* TODO currently we don't support multiple node types +* we need to run skb_clone at rx path. Check if there +* exist really an use case if we need to support +* multiple node types at the same time. +*/ +if (sdata->vif.type ==NL802154_IFTYPE_NODE && + nsdata->vif.type ==NL802154_IFTYPE_NODE ) +return -EBUSY ; +/* check all phy mac sublayer settings are the same. * We have only one phy, different values makes trouble. */
Signature · 1 line
2.2.0
Hi Alex,
Quoted 10 lines
This patch series contains changes for a better multiple iface handling. We have only one phy with several mac parameters like csma, aret, etc. Currently it could be that one interface can overwrite these parameters while ifup when another interface is currently running. To avoid that we compare each parameter and check if differs, if not we allow to ifup the interface.
changes since v2:
- fix mixed comments and variable declaration.
Quoted 6 lines
Alexander Aring (2):
mac802154: iface: check concurrent ifaces
ieee802154: iface: move multiple node type check
net/mac802154/iface.c| 100 +++++++++++++++++++++++++++++++++++++++++++-------1 file changed, 86 insertions(+), 14 deletions(-)
both patches have been applied to bluetooth-next tree.
Regards
Marcel