mac80211: send only vlan group traffics in 80211 xmit path
PATCH 1/1 mac80211: send only vlan group traffics in 80211 xmit path
AP-VLAN multicast/broadcast packets are expected to be encrypted in software. Those packets should follow 802.11 xmit path. AP-VLAN unicast packets can go with encryption in driver/hardware. Redirect these packets to 'ieee80211_8023_xmit' from '__ieee80211_subif_start_xmit' if encapsulation offload is enabled on AP interface.
--- net/mac80211/tx.c | 201 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 106 insertions(+), 95 deletions(-)
net/mac80211/tx.c +106 -95
@@ -3919,101 +3919,6 @@ void ieee80211_txq_schedule_start(struct ieee80211_hw *hw, u8 ac) }EXPORT_SYMBOL (ieee80211_txq_schedule_start); -void __ieee80211_subif_start_xmit (struct sk_buff *skb, -struct net_device *dev, -u32 info_flags, -u32 ctrl_flags, -u64 *cookie) -{ -struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); -struct ieee80211_local *local = sdata->local; -struct sta_info *sta; -struct sk_buff *next; - -if (unlikely (skb->len <ETH_HLEN )) { -kfree_skb (skb); -return ; - } - -rcu_read_lock (); - -if (ieee80211_lookup_ra_sta (sdata, skb, &sta)) - goto out_free; - -if (IS_ERR (sta)) - sta =NULL ; - -if (local->ops->wake_tx_queue) { -u16 queue =__ieee80211_select_queue (sdata, sta, skb); -skb_set_queue_mapping (skb, queue); -skb_get_hash (skb); - } - -if (sta) { -struct ieee80211_fast_tx *fast_tx; - -sk_pacing_shift_update (skb->sk, sdata->local->hw.tx_sk_pacing_shift); - - fast_tx =rcu_dereference (sta->fast_tx); - -if (fast_tx && -ieee80211_xmit_fast (sdata, sta, fast_tx, skb)) - goto out; - } - -if (skb_is_gso (skb)) { -struct sk_buff *segs; - - segs =skb_gso_segment (skb,0 ); -if (IS_ERR (segs)) { - goto out_free; - }else if (segs) { -consume_skb (skb); - skb = segs; - } - }else { -/* we cannot process non-linear frames on this path */ -if (skb_linearize (skb)) { -kfree_skb (skb); - goto out; - } - -/* the frame could be fragmented, software-encrypted, and other -* things so we cannot really handle checksum offload with it - -* fix it up in software before we handle anything else. -*/ -if (skb->ip_summed ==CHECKSUM_PARTIAL ) { -skb_set_transport_header (skb, -skb_checksum_start_offset (skb)); -if (skb_checksum_help (skb)) - goto out_free; - } - } - - skb_list_walk_safe(skb, skb, next) { -skb_mark_not_on_list (skb); - -if (skb->protocol == sdata->control_port_protocol) - ctrl_flags |=IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP ; - - skb =ieee80211_build_hdr (sdata, skb, info_flags, - sta, ctrl_flags, cookie); -if (IS_ERR (skb)) { -kfree_skb_list (next); - goto out; - } - -ieee80211_tx_stats (dev, skb->len); - -ieee80211_xmit (sdata, sta, skb); - } - goto out; - out_free: -kfree_skb (skb); - out: -rcu_read_unlock (); -} -static int ieee80211_change_da (struct sk_buff *skb,struct sta_info *sta) {struct ethhdr *eth;
@@ -4267,6 +4172,112 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,kfree_skb (skb); } +void __ieee80211_subif_start_xmit (struct sk_buff *skb, +struct net_device *dev, +u32 info_flags, +u32 ctrl_flags, +u64 *cookie) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct ieee80211_local *local = sdata->local; +struct sta_info *sta; +struct sk_buff *next; +struct ieee80211_sub_if_data *ap_sdata; + +if (unlikely (skb->len <ETH_HLEN )) { +kfree_skb (skb); +return ; + } + +rcu_read_lock (); + +if (ieee80211_lookup_ra_sta (sdata, skb, &sta)) + goto out_free; + +if (IS_ERR (sta)) + sta =NULL ; + +if (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) { + ap_sdata =container_of (sdata->bss, + struct ieee80211_sub_if_data, u.ap); +if (ap_sdata->hw_80211_encap && !is_multicast_ether_addr (skb->data)) { +ieee80211_8023_xmit (sdata, dev, sta, skb); +rcu_read_unlock (); +return ; + } + } + +if (local->ops->wake_tx_queue) { +u16 queue =__ieee80211_select_queue (sdata, sta, skb); +skb_set_queue_mapping (skb, queue); +skb_get_hash (skb); + } + +if (sta) { +struct ieee80211_fast_tx *fast_tx; + +sk_pacing_shift_update (skb->sk, sdata->local->hw.tx_sk_pacing_shift); + + fast_tx =rcu_dereference (sta->fast_tx); + +if (fast_tx && +ieee80211_xmit_fast (sdata, sta, fast_tx, skb)) + goto out; + } + +if (skb_is_gso (skb)) { +struct sk_buff *segs; + + segs =skb_gso_segment (skb,0 ); +if (IS_ERR (segs)) { + goto out_free; + }else if (segs) { +consume_skb (skb); + skb = segs; + } + }else { +/* we cannot process non-linear frames on this path */ +if (skb_linearize (skb)) { +kfree_skb (skb); + goto out; + } + +/* the frame could be fragmented, software-encrypted, and other +* things so we cannot really handle checksum offload with it - +* fix it up in software before we handle anything else. +*/ +if (skb->ip_summed ==CHECKSUM_PARTIAL ) { +skb_set_transport_header (skb, +skb_checksum_start_offset (skb)); +if (skb_checksum_help (skb)) + goto out_free; + } + } + + skb_list_walk_safe(skb, skb, next) { +skb_mark_not_on_list (skb); + +if (skb->protocol == sdata->control_port_protocol) + ctrl_flags |=IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP ; + + skb =ieee80211_build_hdr (sdata, skb, info_flags, + sta, ctrl_flags, cookie); +if (IS_ERR (skb)) { +kfree_skb_list (next); + goto out; + } + +ieee80211_tx_stats (dev, skb->len); + +ieee80211_xmit (sdata, sta, skb); + } + goto out; + out_free: +kfree_skb (skb); + out: +rcu_read_unlock (); +} +netdev_tx_t ieee80211_subif_start_xmit_8023 (struct sk_buff *skb,struct net_device *dev) {
Signature · 1 line
2.7.4
Johannes Berg
maintainerQuoted 2 lines · Seevalamuthu Mariappan
AP-VLAN multicast/broadcast packets are expected to be encrypted in software.
Err. Expected by whom?
Quoted 1 line
Those packets should follow 802.11 xmit path.
You should explain why ...
net/mac80211/tx.c void ieee80211_txq_schedule_start(struct ieee80211_hw *hw, u8 ac) · line 3926
Quoted 5 lines
net/mac80211/tx.c +0
-5-void __ieee80211_subif_start_xmit (struct sk_buff *skb, -struct net_device *dev, -u32 info_flags, -u32 ctrl_flags, -u64 *cookie)
There's no way I can review this if you move the whole function while making a small change to it ...
johannes
Hi Johannes,
Quoted 5 lines · Johannes Berg
Quoted 2 lines · Seevalamuthu Mariappan
AP-VLAN multicast/broadcast packets are expected to be encrypted in software.
Err. Expected by whom?
Not an expectation exactly. As of now, AP-VLAN multicast/broadcast packets are encrypted in mac80211 itself. So these packets needs to go through 80211_xmit path. This change is just to redirect the other packets (unicast) to 802.3 xmit path if hw encap is enabled on AP interface.
Quoted 5 lines
Quoted 2 lines
Those packets should follow 802.11 xmit path.
You should explain why ...
Quoted 8 lines
net/mac80211/tx.c void ieee80211_txq_schedule_start(struct ieee80211_hw *hw, u8 ac) · line 3926
Quoted 5 lines
net/mac80211/tx.c +0
-5-void __ieee80211_subif_start_xmit (struct sk_buff *skb, -struct net_device *dev, -u32 info_flags, -u32 ctrl_flags, -u64 *cookie)There's no way I can review this if you move the whole function while making a small change to it ...
Will split into two patches, one having function movement and another patch having the actual change.
Quoted 2 lines
johannes
Thanks,
Seevalamuthu M
Quoted 8 lines · Seevalamuthu Mariappan
AP-VLAN multicast/broadcast packets are expected to be encrypted in software. Those packets should follow 802.11 xmit path. AP-VLAN unicast packets can go with encryption in driver/hardware. Redirect these packets to '
ieee80211_8023_xmit' from '__ieee80211_subif_start_xmit' if encapsulation offload is enabled on AP interface.Signed-off-by Seevalamuthu Mariappan <[email protected]>
Please take a look at the encap offload cleanup series that I posted and build on it before sending new patches that touch this code.
- Felix