wireless: Add support to probe unexercised mesh link
Subsystems (2)
v2 cover wireless: Add support to probe unexercised mesh link
Consider below mesh topology.
MP1
/ \
/ \
MP2 --- MP3Assume that even though MP1 & MP3 have direct mesh links, the path was established via MP2. (MP1 <-> MP2 <-> MP3). The 1-hop mesh link MP1 <-> MP3 never be excercised till the current path is terminated. As of now, there is no option to send data frame to pick other than primary path. So mesh link metric between MP1 & MP3 never be updated. This series allows user to send data to 1-hop mesh peers through unexercised mesh path.
-Rajkumar
Rajkumar Manoharan (3):
cfg80211: add support to probe unexercised mesh link
mac80211: add option for setting control flags
mac80211: probe unexercised mesh links
include/net/cfg80211.h | 6 +++++ include/net/mac80211.h | 2 ++ include/uapi/linux/nl80211.h | 16 +++++++++++++ net/mac80211/cfg.c | 1 + net/mac80211/ieee80211_i.h | 5 +++- net/mac80211/mesh_hwmp.c | 4 ++++ net/mac80211/tdls.c | 2 +- net/mac80211/tx.c | 54 ++++++++++++++++++++++++++++++++++++++------ net/wireless/nl80211.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 13 +++++++++++ net/wireless/trace.h | 19 ++++++++++++++++ 11 files changed, 167 insertions(+), 9 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/3 cfg80211: add support to probe unexercised mesh link
Adding support to allow mesh HWMP to measure link metrics on unexercised direct mesh path by sending some data frames to other mesh points which are not currently selected as a primary traffic path but only 1 hop away. The absence of the primary path to the chosen node makes it necessary to apply some form of marking on a chosen packet stream so that the packets can be properly steered to the selected node for testing, and not by the regular mesh path lookup.
--- include/net/cfg80211.h | 6 +++++ include/uapi/linux/nl80211.h | 16 +++++++++++++ net/wireless/nl80211.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 13 +++++++++++ net/wireless/trace.h | 19 ++++++++++++++++ 5 files changed, 108 insertions(+)
include/net/cfg80211.h +6 -0
@@ -3379,6 +3379,9 @@ struct cfg80211_pmsr_request {* Statistics should be cumulative, currently no way to reset is provided. * @start_pmsr: start peer measurement (e.g. FTM) * @abort_pmsr: abort peer measurement +* +* @probe_mesh_link: Probe direct Mesh peer's link quality by sending data frame +* and overrule HWMP path selection algorithm. */ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy,struct cfg80211_wowlan *wow);
@@ -3693,6 +3696,9 @@ struct cfg80211_ops { struct cfg80211_pmsr_request *request);void (*abort_pmsr)(struct wiphy *wiphy,struct wireless_dev *wdev,struct cfg80211_pmsr_request *request); + +int (*probe_mesh_link)(struct wiphy *wiphy,struct net_device *dev, +const u8 *buf,size_t len); };/*
include/uapi/linux/nl80211.h +16 -0
@@ -1065,6 +1065,21 @@* indicated by %NL80211_ATTR_WIPHY_FREQ and other attributes * determining the width and type. * +* @NL80211_CMD_PROBE_MESH_LINK: The requirement for mesh link metric +* refreshing, is that from one mesh point we be able to send some data +* frames to other mesh points which are not currently selected as a +* primary traffic path, but which are only 1 hop away. The absence of +* the primary path to the chosen node makes it necessary to apply some +* form of marking on a chosen packet stream so that the packets can be +* properly steered to the selected node for testing, and not by the +* regular mesh path lookup. Further, the packets must be of type data +* so that the rate control (often embedded in firmware) is used for +* rate selection. +* +* Here attribute %NL80211_ATTR_MAC is used to specify connected mesh +* peer MAC address and %NL80211_ATTR_FRAME is used to specify the frame +* content. The frame is ethernet data. +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -1284,6 +1299,7 @@ enum nl80211_commands {NL80211_CMD_PEER_MEASUREMENT_COMPLETE ,NL80211_CMD_NOTIFY_RADAR , + NL80211_CMD_PROBE_MESH_LINK,/* add new commands above here */
net/wireless/nl80211.c +54 -0
66 lines not on this page · raw message
net/wireless/rdev-ops.h +13 -0
@@ -1272,4 +1272,17 @@ static inline int rdev_del_pmk(struct cfg80211_registered_device *rdev, trace_rdev_return_void(&rdev->wiphy); } +static inline int +rdev_probe_mesh_link (struct cfg80211_registered_device *rdev, +struct net_device *dev,const u8 *dest, +const void *buf,size_t len) +{ +int ret; + +trace_rdev_probe_mesh_link (&rdev->wiphy, dev, dest, buf, len); + ret = rdev->ops->probe_mesh_link (&rdev->wiphy, dev, buf, len); +trace_rdev_return_int (&rdev->wiphy, ret); +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +19 -0
@@ -3362,6 +3362,25 @@WIPHY_PR_ARG ,WDEV_PR_ARG , (unsigned long long)__entry->cookie) ); + +TRACE_EVENT (rdev_probe_mesh_link, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, + const u8 *dest, const u8 *buf, size_t len), +TP_ARGS (wiphy, netdev, dest, buf, len), +TP_STRUCT__entry ( + WIPHY_ENTRY + NETDEV_ENTRY +MAC_ENTRY (dest) + ), +TP_fast_assign ( + WIPHY_ASSIGN; + NETDEV_ASSIGN; + MAC_ASSIGN(dest, dest); + ), +TP_printk (WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT , +WIPHY_PR_ARG ,NETDEV_PR_ARG ,MAC_PR_ARG (dest)) +); +#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
Signature · 1 line
1.9.1
PATCH v2 2/3 mac80211: add option for setting control flags
In reply to Rajkumar ManoharanAllows setting of control flags of skb cb - if needed - when calling ieee80211_subif_start_xmit().
--- net/mac80211/ieee80211_i.h | 3 ++- net/mac80211/tdls.c | 2 +- net/mac80211/tx.c | 18 +++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-)
net/mac80211/ieee80211_i.h +2 -1
@@ -1736,7 +1736,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev);void __ieee80211_subif_start_xmit (struct sk_buff *skb,struct net_device *dev, -u32 info_flags); +u32 info_flags, +u32 ctrl_flags);void ieee80211_purge_tx_queue (struct ieee80211_hw *hw,struct sk_buff_head *skbs); struct sk_buff *
net/mac80211/tdls.c +1 -1
@@ -1055,7 +1055,7 @@ static void ieee80211_tdls_add_ies(struct ieee80211_sub_if_data *sdata,/* disable bottom halves when entering the Tx path */ local_bh_disable (); -__ieee80211_subif_start_xmit (skb, dev, flags); +__ieee80211_subif_start_xmit (skb, dev, flags,0 );local_bh_enable ();return ret;
net/mac80211/tx.c +11 -7
@@ -2424,6 +2424,7 @@ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,* @sdata: virtual interface to build the header for * @skb: the skb to build the header in * @info_flags: skb flags to set +* @ctrl_flags: info control flags to set * * This function takes the skb with 802.3 header and reformats the header to * the appropriate IEEE 802.11 header based on which interface the packet is
@@ -2439,7 +2440,7 @@ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,*/ static struct sk_buff *ieee80211_build_hdr (struct ieee80211_sub_if_data *sdata,struct sk_buff *skb,u32 info_flags, -struct sta_info *sta) +struct sta_info *sta,u32 ctrl_flags) {struct ieee80211_local *local = sdata->local;struct ieee80211_tx_info *info;
@@ -2811,6 +2812,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, info->flags = info_flags; info->ack_frame_id = info_id; info->band = band; + info->control.flags = ctrl_flags;return skb; free:
@@ -3638,7 +3640,8 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,void __ieee80211_subif_start_xmit (struct sk_buff *skb,struct net_device *dev, -u32 info_flags) +u32 info_flags, +u32 ctrl_flags) {struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct sta_info *sta;
@@ -3703,7 +3706,8 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, skb->prev =NULL ; skb->next =NULL ; - skb =ieee80211_build_hdr (sdata, skb, info_flags, sta); + skb =ieee80211_build_hdr (sdata, skb, info_flags, + sta, ctrl_flags);if (IS_ERR (skb)) goto out;
@@ -3843,9 +3847,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,__skb_queue_head_init (&queue);ieee80211_convert_to_unicast (skb, dev, &queue);while ((skb =__skb_dequeue (&queue))) -__ieee80211_subif_start_xmit (skb, dev,0 ); +__ieee80211_subif_start_xmit (skb, dev,0 ,0 ); }else { -__ieee80211_subif_start_xmit (skb, dev,0 ); +__ieee80211_subif_start_xmit (skb, dev,0 ,0 ); }return NETDEV_TX_OK ;
@@ -3870,7 +3874,7 @@ struct sk_buff * goto out; } - skb =ieee80211_build_hdr (sdata, skb, info_flags, sta); + skb =ieee80211_build_hdr (sdata, skb, info_flags, sta,0 );if (IS_ERR (skb)) goto out;
@@ -4907,7 +4911,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,skb_reset_mac_header (skb);local_bh_disable (); -__ieee80211_subif_start_xmit (skb, skb->dev, flags); +__ieee80211_subif_start_xmit (skb, skb->dev, flags,0 );local_bh_enable ();return 0 ;
Signature · 1 line
1.9.1
PATCH v2 3/3 mac80211: probe unexercised mesh links
In reply to Rajkumar ManoharanThe requirement for mesh link metric refreshing, is that from one mesh point we be able to send some data frames to other mesh points which are not currently selected as a primary traffic path, but which are only 1 hop away. The absence of the primary path to the chosen node makes it necessary to apply some form of marking on a chosen packet stream so that the packets can be properly steered to the selected node for testing, and not by the regular mesh path lookup.
---
v2: fix addr1 for injected frames
include/net/mac80211.h | 2 ++ net/mac80211/cfg.c | 1 + net/mac80211/ieee80211_i.h | 2 ++ net/mac80211/mesh_hwmp.c | 4 ++++ net/mac80211/tx.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+)
include/net/mac80211.h +2 -0
@@ -786,6 +786,7 @@ enum mac80211_tx_info_flags {* @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame * @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path +* @IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP: This frame skips mesh path lookup * * These flags are used in tx_info->control.flags. */
@@ -795,6 +796,7 @@ enum mac80211_tx_control_flags {IEEE80211_TX_CTRL_RATE_INJECT =BIT (2 ),IEEE80211_TX_CTRL_AMSDU =BIT (3 ),IEEE80211_TX_CTRL_FAST_XMIT =BIT (4 ), + IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP = BIT(5), };/*
net/mac80211/cfg.c +1 -0
@@ -3978,4 +3978,5 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy, .get_ftm_responder_stats = ieee80211_get_ftm_responder_stats, .start_pmsr = ieee80211_start_pmsr, .abort_pmsr = ieee80211_abort_pmsr, + .probe_mesh_link = ieee80211_probe_mesh_link, };
net/mac80211/ieee80211_i.h +2 -0
@@ -1754,6 +1754,8 @@ void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb,int ieee80211_tx_control_port (struct wiphy *wiphy,struct net_device *dev,const u8 *buf,size_t len,const u8 *dest,__be16 proto,bool unencrypted); +int ieee80211_probe_mesh_link (struct wiphy *wiphy,struct net_device *dev, +const u8 *buf,size_t len);/* HT */ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
net/mac80211/mesh_hwmp.c +4 -0
@@ -1118,6 +1118,10 @@ int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata,if (ieee80211_is_qos_nullfunc (hdr->frame_control))return 0 ; +/* Allow injected packets to bypass mesh routing */ +if (info->control.flags &IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP ) +return 0 ; +rcu_read_lock (); err =mesh_nexthop_lookup (sdata, skb);if (!err)
net/mac80211/tx.c +36 -0
@@ -2594,6 +2594,13 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, goto free; } band = chanctx_conf->def.chan->band; + +/* For injected frames, fill RA right away as nexthop lookup +* will be skipped. +*/ +if ((ctrl_flags &IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP ) && +is_zero_ether_addr (hdr.addr1)) +memcpy (hdr.addr1, skb->data +ETH_ALEN ,ETH_ALEN );break ;#endif case NL80211_IFTYPE_STATION :
@@ -4916,3 +4923,32 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,return 0 ; } + +int ieee80211_probe_mesh_link (struct wiphy *wiphy,struct net_device *dev, +const u8 *buf,size_t len) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct ieee80211_local *local = sdata->local; +struct sk_buff *skb; + + skb =dev_alloc_skb (local->hw.extra_tx_headroom + len + +30 +/* header size */ +18 );/* 11s header size */ +if (!skb) +return -ENOMEM ; + +skb_reserve (skb, local->hw.extra_tx_headroom); +skb_put_data (skb, buf, len); + + skb->dev = dev; + skb->protocol =htons (ETH_P_802_3 ); +skb_reset_network_header (skb); +skb_reset_mac_header (skb); + +local_bh_disable (); +__ieee80211_subif_start_xmit (skb, skb->dev,0 , +IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP ); +local_bh_enable (); + +return 0 ; +}
Signature · 1 line
1.9.1