wifi: mac80211: fix qos on mesh interfaces
Subsystems (2)
PATCH 1/7 wifi: mac80211: fix qos on mesh interfaces
When ieee80211_select_queue is called for mesh, the sta pointer is usually NULL, since the nexthop is looked up much later in the tx path. Explicitly check for unicast address in that case in order to make qos work again.
Fixes 50e2ab392919 ("wifi: mac80211: fix queue selection for mesh/OCB interfaces")
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/wme.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/mac80211/wme.c +4 -2
@@ -147,6 +147,7 @@ u16 ieee80211_select_queue_80211(struct ieee80211_sub_if_data *sdata,u16 ieee80211_select_queue (struct ieee80211_sub_if_data *sdata,struct sta_info *sta,struct sk_buff *skb) { +const struct ethhdr *eth = (void *)skb->data;struct mac80211_qos_map *qos_map;bool qos;
@@ -154,8 +155,9 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,skb_get_hash (skb);/* all mesh/ocb stations are required to support WME */ -if (sta && (sdata->vif.type ==NL80211_IFTYPE_MESH_POINT || - sdata->vif.type ==NL80211_IFTYPE_OCB )) +if ((sdata->vif.type ==NL80211_IFTYPE_MESH_POINT && + !is_multicast_ether_addr (eth->h_dest)) || + (sdata->vif.type ==NL80211_IFTYPE_OCB && sta)) qos = true;else if (sta) qos = sta->sta.wme;
Signature · 1 line
2.39.0
PATCH 2/7 wifi: mac80211: fix race in mesh sequence number assignment
Since the sequence number is shared across different tx queues, it needs to be atomic in order to avoid accidental duplicate assignment
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/mesh.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-)
net/mac80211/ieee80211_i.h +1 -1
@@ -696,7 +696,7 @@ struct ieee80211_if_mesh {struct mesh_stats mshstats;struct mesh_config mshcfg;atomic_t estab_plinks; -u32 mesh_seqnum; +atomic_t mesh_seqnum;bool accepting_plinks;int num_gates;struct beacon_data __rcu *beacon;
net/mac80211/mesh.c +2 -4
@@ -752,10 +752,8 @@ unsigned int ieee80211_new_mesh_header(struct ieee80211_sub_if_data *sdata, meshhdr->ttl = sdata->u.mesh.mshcfg.dot11MeshTTL; -/* FIXME: racy -- TX on multiple queues can be concurrent */ -put_unaligned (cpu_to_le32 (sdata->u.mesh.mesh_seqnum), &meshhdr->seqnum); - sdata->u.mesh.mesh_seqnum++; - +put_unaligned_le32 (atomic_inc_return (&sdata->u.mesh.mesh_seqnum), + &meshhdr->seqnum);if (addr4or5 && !addr6) { meshhdr->flags |=MESH_FLAGS_AE_A4 ;memcpy (meshhdr->eaddr1, addr4or5,ETH_ALEN );
Signature · 1 line
2.39.0
PATCH 3/7 wifi: mac80211: fix mesh path discovery based on unicast packets
In reply to Felix FietkauIf a packet has reached its intended destination, it was bumped to the code that accepts it, without first checking if a mesh_path needs to be created based on the discovered source.
Fix this by moving the destination address check further down
Fixes 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces")
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/rx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
net/mac80211/rx.c +11 -11
@@ -2746,17 +2746,6 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *sta mesh_rmc_check(sdata, eth->h_source, mesh_hdr))return RX_DROP_MONITOR ; -/* Frame has reached destination. Don't forward */ -if (ether_addr_equal (sdata->vif.addr, eth->h_dest)) - goto rx_accept; - -if (!ifmsh->mshcfg.dot11MeshForwarding) { -if (is_multicast_ether_addr (eth->h_dest)) - goto rx_accept; - -return RX_DROP_MONITOR ; - } -/* forward packet */ if (sdata->crypto_tx_tailroom_needed_cnt) tailroom =IEEE80211_ENCRYPT_TAILROOM ;
@@ -2795,6 +2784,17 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *starcu_read_unlock (); } +/* Frame has reached destination. Don't forward */ +if (ether_addr_equal (sdata->vif.addr, eth->h_dest)) + goto rx_accept; + +if (!ifmsh->mshcfg.dot11MeshForwarding) { +if (is_multicast_ether_addr (eth->h_dest)) + goto rx_accept; + +return RX_DROP_MONITOR ; + } +skb_set_queue_mapping (skb, ieee802_1d_to_ac[skb->priority]); ieee80211_fill_mesh_addresses(&hdr, &hdr.frame_control,
Signature · 1 line
2.39.0
PATCH 4/7 wifi: mac80211: mesh fast xmit support
In reply to Felix FietkauPreviously, fast xmit only worked on interface types where initially a sta lookup is performed, and a cached header can be attached to the sta, requiring only some fields to be updated at runtime.
This technique is not directly applicable for a mesh device type due to the dynamic nature of the topology and protocol. There are more addresses that need to be filled, and there is an extra header with a dynamic length based on the addressing mode.
Change the code to cache entries contain a copy of the mesh subframe header + bridge tunnel header, as well as an embedded struct ieee80211_fast_tx, which contains the information for building the 802.11 header.
Add a mesh specific early fast xmit call, which looks up a cached entry and adds only the mesh subframe header, before passing it over to the generic fast xmit code.
To ensure the changes in network are reflected in these cached headers, flush affected cached entries on path changes, as well as other conditions that currently trigger a fast xmit check in other modes (key changes etc.)
This code is loosely based on a previous implementation by:
Sriram R <[email protected]>
Cc Sriram R <[email protected]>
Signed-off-by Ryder Lee <[email protected]>
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/ieee80211_i.h | 20 +++ net/mac80211/mesh.c | 92 ++++++++++++ net/mac80211/mesh.h | 44 ++++++ net/mac80211/mesh_hwmp.c | 37 +++-- net/mac80211/mesh_pathtbl.c | 282 ++++++++++++++++++++++++++++++++++++ net/mac80211/rx.c | 10 +- net/mac80211/tx.c | 47 ++++-- 7 files changed, 507 insertions(+), 25 deletions(-)
net/mac80211/ieee80211_i.h +20 -0
@@ -37,6 +37,7 @@extern const struct cfg80211_ops mac80211_config_ops;struct ieee80211_local ; +struct ieee80211_mesh_fast_tx ;/* Maximum number of broadcast/multicast frames to buffer when some of the * associated stations are using power saving. */
@@ -656,6 +657,19 @@ struct mesh_table {atomic_t entries;/* Up to MAX_MESH_NEIGHBOURS */ }; +/** +* struct mesh_tx_cache - mesh fast xmit header cache +* +* @rht: hash table containing struct ieee80211_mesh_fast_tx, using skb DA as key +* @walk_head: linked list containing all ieee80211_mesh_fast_tx objects +* @walk_lock: lock protecting walk_head and rht +*/ +struct mesh_tx_cache { +struct rhashtable rht; +struct hlist_head walk_head; +spinlock_t walk_lock; +}; +struct ieee80211_if_mesh {struct timer_list housekeeping_timer;struct timer_list mesh_path_timer;
@@ -734,6 +748,7 @@ struct ieee80211_if_mesh {struct mesh_table mpp_paths;/* Store paths for MPP&MAP */ int mesh_paths_generation;int mpp_paths_generation; +struct mesh_tx_cache tx_cache; };#ifdef CONFIG_MAC80211_MESH
@@ -2017,6 +2032,11 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, int link_id, u64 *cookie);int ieee80211_probe_mesh_link (struct wiphy *wiphy,struct net_device *dev,const u8 *buf,size_t len); +void __ieee80211_xmit_fast (struct ieee80211_sub_if_data *sdata, +struct sta_info *sta, +struct ieee80211_fast_tx *fast_tx, +struct sk_buff *skb,bool ampdu, +const u8 *da,const u8 *sa);/* HT */ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
net/mac80211/mesh.c +92 -0
110 lines not on this page · raw message
net/mac80211/mesh.h +44 -0
61 lines not on this page · raw message
net/mac80211/mesh_hwmp.c +28 -9
@@ -394,6 +394,7 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata,u32 orig_sn, orig_metric;unsigned long orig_lifetime, exp_time;u32 last_hop_metric, new_metric; +bool flush_mpath = false;bool process = true;u8 hopcount;
@@ -491,8 +492,10 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, }if (fresh_info) { -if (rcu_access_pointer (mpath->next_hop) != sta) +if (rcu_access_pointer (mpath->next_hop) != sta) { mpath->path_change_count++; + flush_mpath = true; + }mesh_path_assign_nexthop (mpath, sta); mpath->flags |=MESH_PATH_SN_VALID ; mpath->metric = new_metric;
@@ -502,6 +505,8 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, mpath->hop_count = hopcount;mesh_path_activate (mpath);spin_unlock_bh (&mpath->state_lock); +if (flush_mpath) +mesh_fast_tx_flush_mpath (mpath);ewma_mesh_fail_avg_init (&sta->mesh->fail_avg);/* init it at a low value - 0 start is tricky */ ewma_mesh_fail_avg_add (&sta->mesh->fail_avg,1 );
@@ -539,8 +544,10 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, }if (fresh_info) { -if (rcu_access_pointer (mpath->next_hop) != sta) +if (rcu_access_pointer (mpath->next_hop) != sta) { mpath->path_change_count++; + flush_mpath = true; + }mesh_path_assign_nexthop (mpath, sta); mpath->metric = last_hop_metric; mpath->exp_time =time_after (mpath->exp_time, exp_time)
@@ -548,6 +555,8 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, mpath->hop_count =1 ;mesh_path_activate (mpath);spin_unlock_bh (&mpath->state_lock); +if (flush_mpath) +mesh_fast_tx_flush_mpath (mpath);ewma_mesh_fail_avg_init (&sta->mesh->fail_avg);/* init it at a low value - 0 start is tricky */ ewma_mesh_fail_avg_add (&sta->mesh->fail_avg,1 );
@@ -1215,6 +1224,20 @@ static int mesh_nexthop_lookup_nolearn(struct ieee80211_sub_if_data *sdata,return 0 ; } +void mesh_path_refresh (struct ieee80211_sub_if_data *sdata, +struct mesh_path *mpath,const u8 *addr) +{ +if (mpath->flags & (MESH_PATH_REQ_QUEUED |MESH_PATH_FIXED | +MESH_PATH_RESOLVING )) +return ; + +if (time_after (jiffies, + mpath->exp_time - +msecs_to_jiffies (sdata->u.mesh.mshcfg.path_refresh_time)) && + (!addr ||ether_addr_equal (sdata->vif.addr, addr))) +mesh_queue_preq (mpath,PREQ_Q_F_START |PREQ_Q_F_REFRESH ); +} +/** * mesh_nexthop_lookup - put the appropriate next hop on a mesh frame. Calling * this function is considered "using" the associated mpath, so preempt a path
@@ -1242,19 +1265,15 @@ int mesh_nexthop_lookup(struct ieee80211_sub_if_data *sdata,if (!mpath || !(mpath->flags &MESH_PATH_ACTIVE ))return -ENOENT ; -if (time_after (jiffies, - mpath->exp_time - -msecs_to_jiffies (sdata->u.mesh.mshcfg.path_refresh_time)) && -ether_addr_equal (sdata->vif.addr, hdr->addr4) && - !(mpath->flags &MESH_PATH_RESOLVING ) && - !(mpath->flags &MESH_PATH_FIXED )) -mesh_queue_preq (mpath,PREQ_Q_F_START |PREQ_Q_F_REFRESH ); +mesh_path_refresh (sdata, mpath, hdr->addr4); next_hop =rcu_dereference (mpath->next_hop);if (next_hop) {memcpy (hdr->addr1, next_hop->sta.addr,ETH_ALEN );memcpy (hdr->addr2, sdata->vif.addr,ETH_ALEN );ieee80211_mps_set_frame_flags (sdata, next_hop, hdr); +if (ieee80211_hw_check (&sdata->local->hw,SUPPORT_FAST_XMIT )) +mesh_fast_tx_cache (sdata, skb, mpath);return 0 ; }
net/mac80211/mesh_pathtbl.c +282 -0
330 lines not on this page · raw message
net/mac80211/rx.c +9 -1
@@ -2761,6 +2761,7 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *staif (mesh_hdr->flags &MESH_FLAGS_AE ) {struct mesh_path *mppath;char *proxied_addr; +bool update = false;if (multicast) proxied_addr = mesh_hdr->eaddr1;
@@ -2776,11 +2777,18 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *stampp_path_add (sdata, proxied_addr, eth->h_source); }else {spin_lock_bh (&mppath->state_lock); -if (!ether_addr_equal (mppath->mpp, eth->h_source)) +if (!ether_addr_equal (mppath->mpp, eth->h_source)) {memcpy (mppath->mpp, eth->h_source,ETH_ALEN ); + update = true; + } mppath->exp_time = jiffies;spin_unlock_bh (&mppath->state_lock); } + +/* flush fast xmit cache if the address path changed */ +if (update) +mesh_fast_tx_flush_addr (sdata, proxied_addr); +rcu_read_unlock (); }
net/mac80211/tx.c +32 -15
135 lines not on this page · raw message
Signature · 1 line
2.39.0
PATCH 5/7 wifi: mac80211: use mesh header cache to speed up mesh forwarding
In reply to Felix FietkauSignificantly reduces mesh forwarding path CPU usage and enables the direct use of iTXQ.
Signed-off-by Felix Fietkau <[email protected]>
Signed-off-by Ryder Lee <[email protected]>
--- net/mac80211/ieee80211_i.h | 2 ++ net/mac80211/rx.c | 65 +++++++++++++++++++++++++++++++++++++- net/mac80211/tx.c | 6 ++-- 3 files changed, 68 insertions(+), 5 deletions(-)
net/mac80211/ieee80211_i.h +2 -0
@@ -2037,6 +2037,8 @@ void __ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,struct ieee80211_fast_tx *fast_tx, struct sk_buff *skb, bool ampdu, const u8 *da, const u8 *sa); +void ieee80211_aggr_check (struct ieee80211_sub_if_data *sdata, +struct sta_info *sta,struct sk_buff *skb);/* HT */ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
net/mac80211/rx.c +64 -1
89 lines not on this page · raw message
net/mac80211/tx.c +2 -4
@@ -1189,10 +1189,8 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,return queued; } -static void -ieee80211_aggr_check (struct ieee80211_sub_if_data *sdata, -struct sta_info *sta, -struct sk_buff *skb) +void ieee80211_aggr_check (struct ieee80211_sub_if_data *sdata, +struct sta_info *sta,struct sk_buff *skb) {struct rate_control_ref *ref = sdata->local->rate_ctrl;u16 tid;
Signature · 1 line
2.39.0
PATCH 6/7 wifi: mac80211: add mesh fast-rx support
In reply to Felix FietkauThis helps bring down rx CPU usage by avoiding calls to the rx handlers in the slow path. Supports forwarding and local rx, including A-MSDU.
Signed-off-by Felix Fietkau <[email protected]>
Signed-off-by Ryder Lee <[email protected]>
--- net/mac80211/rx.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-)
net/mac80211/rx.c +29 -5
@@ -4542,6 +4542,12 @@ void ieee80211_check_fast_rx(struct sta_info *sta) fastrx.internal_forward =0 ; } +break ; +case NL80211_IFTYPE_MESH_POINT : + fastrx.expected_ds_bits =cpu_to_le16 (IEEE80211_FCTL_FROMDS | +IEEE80211_FCTL_TODS ); + fastrx.da_offs = offsetof(struct ieee80211_hdr , addr3); + fastrx.sa_offs = offsetof(struct ieee80211_hdr , addr4);break ;default : goto clear;
@@ -4751,6 +4757,7 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx,struct sk_buff *skb = rx->skb;struct ieee80211_hdr *hdr = (void *)skb->data;struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb); +static ieee80211_rx_result res;int orig_len = skb->len;int hdrlen =ieee80211_hdrlen (hdr->frame_control);int snap_offs = hdrlen;
@@ -4812,7 +4819,8 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, snap_offs +=IEEE80211_CCMP_HDR_LEN ; } -if (!(status->rx_flags &IEEE80211_RX_AMSDU )) { +if (!ieee80211_vif_is_mesh (&rx->sdata->vif) && + !(status->rx_flags &IEEE80211_RX_AMSDU )) {if (!pskb_may_pull (skb, snap_offs +sizeof (*payload)))return false;
@@ -4851,13 +4859,29 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx,/* do the header conversion - first grab the addresses */ ether_addr_copy (addrs.da, skb->data + fast_rx->da_offs);ether_addr_copy (addrs.sa, skb->data + fast_rx->sa_offs); -skb_postpull_rcsum (skb, skb->data + snap_offs, -sizeof (rfc1042_header) +2 ); -/* remove the SNAP but leave the ethertype */ -skb_pull (skb, snap_offs +sizeof (rfc1042_header)); +if (ieee80211_vif_is_mesh (&rx->sdata->vif)) { +skb_pull (skb, snap_offs -2 ); +put_unaligned_be16 (skb->len -2 , skb->data); + }else { +skb_postpull_rcsum (skb, skb->data + snap_offs, +sizeof (rfc1042_header) +2 ); + +/* remove the SNAP but leave the ethertype */ +skb_pull (skb, snap_offs +sizeof (rfc1042_header)); + }/* push the addresses in front */ memcpy (skb_push (skb,sizeof (addrs)), &addrs,sizeof (addrs)); + res =ieee80211_rx_mesh_data (rx->sdata, rx->sta, rx->skb); +switch (res) { +case RX_QUEUED : +return true; +case RX_CONTINUE : +break ; +default : + goto drop; + } +ieee80211_rx_8023 (rx, fast_rx, orig_len);return true;
Signature · 1 line
2.39.0
PATCH 7/7 mac80211: implement support for yet another mesh A-MSDU format
In reply to Felix FietkauMT7996 hardware supports mesh A-MSDU subframes in hardware, but uses a big-endian length field
Signed-off-by Felix Fietkau <[email protected]>
Signed-off-by Ryder Lee <[email protected]>
--- include/net/cfg80211.h | 11 +++++++---- net/mac80211/rx.c | 22 ++++++++++++++++------ net/mac80211/sta_info.h | 5 ++++- net/wireless/util.c | 36 +++++++++++++++++++++++------------- 4 files changed, 50 insertions(+), 24 deletions(-)
include/net/cfg80211.h +7 -4
@@ -6274,10 +6274,13 @@ static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,* mesh control field. * * @skb: The input A-MSDU frame without any headers. -* @mesh_hdr: use standard compliant mesh A-MSDU subframe header +* @mesh_hdr: the type of mesh header to test +* 0: non-mesh A-MSDU length field +* 1: big-endian mesh A-MSDU length field +* 2: little-endian mesh A-MSDU length field * Returns: true if subframe header lengths are valid for the @mesh_hdr mode */ -bool ieee80211_is_valid_amsdu (struct sk_buff *skb,bool mesh_hdr); +bool ieee80211_is_valid_amsdu (struct sk_buff *skb,u8 mesh_hdr);/** * ieee80211_amsdu_to_8023s - decode an IEEE 802.11n A-MSDU frame
@@ -6294,13 +6297,13 @@ bool ieee80211_is_valid_amsdu(struct sk_buff *skb, bool mesh_hdr);* @extra_headroom: The hardware extra headroom for SKBs in the @list. * @check_da: DA to check in the inner ethernet header, or NULL * @check_sa: SA to check in the inner ethernet header, or NULL -* @mesh_control: A-MSDU subframe header includes the mesh control field +* @mesh_control: see mesh_hdr in ieee80211_is_valid_amsdu */ void ieee80211_amsdu_to_8023s (struct sk_buff *skb,struct sk_buff_head *list,const u8 *addr,enum nl80211_iftype iftype,const unsigned int extra_headroom,const u8 *check_da,const u8 *check_sa, -bool mesh_control); +u8 mesh_control);/** * ieee80211_get_8023_tunnel_proto - get RFC1042 or bridge tunnel encap protocol
net/mac80211/rx.c +16 -6
@@ -2983,13 +2983,23 @@ __ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx, u8 data_offset)return RX_DROP_UNUSABLE ;if (rx->sta && rx->sta->amsdu_mesh_control <0 ) { -bool valid_std =ieee80211_is_valid_amsdu (skb, true); -bool valid_nonstd =ieee80211_is_valid_amsdu (skb, false); +s8 valid =-1 ; +int i; + +for (i =0 ; i <=2 ; i++) { +if (!ieee80211_is_valid_amsdu (skb, i)) +continue ; + +if (valid >=0 ) { +/* ambiguous */ + valid =-1 ; +break ; + } + + valid = i; + } -if (valid_std && !valid_nonstd) - rx->sta->amsdu_mesh_control =1 ; -else if (valid_nonstd && !valid_std) - rx->sta->amsdu_mesh_control =0 ; + rx->sta->amsdu_mesh_control = valid; } ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
net/mac80211/sta_info.h +4 -1
@@ -623,7 +623,10 @@ struct link_sta_info {* @cparams: CoDel parameters for this station. * @reserved_tid: reserved TID (if any, otherwise IEEE80211_TID_UNRESERVED) * @amsdu_mesh_control: track the mesh A-MSDU format used by the peer -* (-1: not yet known, 0: non-standard [without mesh header], 1: standard) +* (-1: not yet known, +* 0: non-mesh A-MSDU length field +* 1: big-endian mesh A-MSDU length field +* 2: little-endian mesh A-MSDU length field) * @fast_tx: TX fastpath information * @fast_rx: RX fastpath information * @tdls_chandef: a TDLS peer can have a wider chandef that is compatible to
net/wireless/util.c +23 -13
@@ -776,7 +776,24 @@ __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,return frame; } -bool ieee80211_is_valid_amsdu (struct sk_buff *skb,bool mesh_hdr) +static u16 +ieee80211_amsdu_subframe_length (void *field,u8 mesh_flags,u8 hdr_type) +{ +__le16 *field_le = field; +__be16 *field_be = field; +u16 len; + +if (hdr_type >=2 ) + len =le16_to_cpu (*field_le); +else + len =be16_to_cpu (*field_be); +if (hdr_type) + len +=__ieee80211_get_mesh_hdrlen (mesh_flags); + +return len; +} + +bool ieee80211_is_valid_amsdu (struct sk_buff *skb,u8 mesh_hdr) {int offset =0 , remaining, subframe_len, padding;
@@ -790,12 +807,8 @@ bool ieee80211_is_valid_amsdu(struct sk_buff *skb, bool mesh_hdr)if (skb_copy_bits (skb, offset +2 *ETH_ALEN , &hdr,sizeof (hdr)) <0 )return false; -if (mesh_hdr) - len =le16_to_cpu (*(__le16 *)&hdr.len) + -__ieee80211_get_mesh_hdrlen (hdr.mesh_flags); -else - len =ntohs (hdr.len); - + len =ieee80211_amsdu_subframe_length (&hdr.len, hdr.mesh_flags, + mesh_hdr); subframe_len =sizeof (struct ethhdr ) + len; padding = (4 - subframe_len) &0x3 ; remaining = skb->len - offset;
@@ -812,7 +825,7 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list, const u8 *addr, enum nl80211_iftype iftype, const unsigned int extra_headroom, const u8 *check_da, const u8 *check_sa, - bool mesh_control) + u8 mesh_control) { unsigned int hlen = ALIGN(extra_headroom, 4);struct sk_buff *frame =NULL ;
@@ -837,11 +850,8 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,skb_copy_bits (skb, offset, &hdr, copy_len);if (iftype ==NL80211_IFTYPE_MESH_POINT ) mesh_len =__ieee80211_get_mesh_hdrlen (hdr.flags); -if (mesh_control) - len =le16_to_cpu (*(__le16 *)&hdr.eth.h_proto) + mesh_len; -else - len =ntohs (hdr.eth.h_proto); - + len =ieee80211_amsdu_subframe_length (&hdr.eth.h_proto, hdr.flags, + mesh_control); subframe_len =sizeof (struct ethhdr ) + len; padding = (4 - subframe_len) &0x3 ;
Signature · 1 line
2.39.0
kernel test robot
build botRe: [PATCH 7/7] mac80211: implement support for yet another mesh A-MSDU format
I love your patch! Perhaps something to improve:
Hi Felix,
I love your patch! Perhaps something to improve:
[auto build test WARNING on wireless-next/main]
[also build test WARNING on wireless/main linus/master v6.3-rc2 next-20230315] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Felix-Fietkau/wifi-mac80211-fix-race-in-mesh-sequence-number-assignment/20230314-180138 base: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git main patch link: https://lore.kernel.org/r/20230314095956.62085-7-nbd%40nbd.name patch subject: [PATCH 7/7] mac80211: implement support for yet another mesh A-MSDU format reproduce: # https://github.com/intel-lab-lkp/linux/commit/c393207cf2199fbd0a5aaf929ddccdec98ef66bc git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Felix-Fietkau/wifi-mac80211-fix-race-in-mesh-sequence-number-assignment/20230314-180138 git checkout c393207cf2199fbd0a5aaf929ddccdec98ef66bc make menuconfig # enable CONFIG_COMPILE_TEST, CONFIG_WARN_MISSING_DOCUMENTS, CONFIG_WARN_ABI_ERRORS make htmldocs
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> Documentation/driver-api/80211/mac80211-advanced:214: ./net/mac80211/sta_info.h:628: WARNING: Unexpected indentation.
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests